HomeFreeBSD

Re-apply change 306811 or alternatively, revert change 307385.