Backed out changeset 4253a66382fa (bug 925898) for test failures