Backout 05914d4f27e3 and 231b7f8046d9 (bug 844635) for causing test failures