This reverts 91d8519c47 since I can't redo the reported error which was in the old header-only info space.
91d8519c47