Backout 9ebed437d78f, 606c4b4ab77f, 686b4b5a5be3, c46514ce6886, 9cbe6533c480 due to critical breakage in bug 945723