Backed out changeset 4d9e5795ee82 (bug 1066450) for test failures