Backout 3635e6adde70, 8600c8ad593f and 1f72556326be (bug 960848 and bug 960899) for lots of red.