Revert commit (fix #2, #3, breaks FreeBSD build).