Backed out changesets 37df1d58af4a and 792b068b7805 (bug 1025445) for Gaia unit test failures.