Back out 15418b394a64 and 1945cbcef58f (bug 911394) for bustage
CLOSED TREE
Automatic merge