reverting r31265 - kept breaking the build on FreeBSD.