Reverted r192992 broke windows and freebsd builds.