Revert "FreeBSD build fixes"

This reverts commit deec82b04d833f8b5827dc7427bff108383c2b06.