HomeFreeBSD

Revert r361704, it accidentally committed merged D25067 and D25070.