third attempt to revert changes and fix nightly build server, gah!