HomeFreeBSD

Revert r357710 and 357711 until they can be debugged