Backed out changeset c11bad5b6251 for test failures. a=backout