Revert parts of r337849 and r337857

This fixes the build and I will redo these changes as part of a future review
that organizes them differently. The way I tried to do it here could be done
better. Sorry for the noise.

Approved by: will (mentor)
Differential Revision: https://reviews.freebsd.org/D16737