Revert r201783 until all FreeBSD fixes are submitted.