Backout bug 1024578 for test failures a=bustage