This undoes fc7864091e2463c0e446f8b3954df4d29e9465af. It was only ever used by the FreeBSD compatibility layer, only supported one structure, and created problems with concurrent builds.