HomeFreeBSD

Revert change 306811 so that the change can be re-done using