Back out fa772ccdf19d (bug 718969) and 050a0a27024a (bug 777474) for being in the way of backing out bustage
CLOSED TREE
Back out 66882ea6f8c7 (bug 788293) and 32f09cb3c7b6 (bug 834090) for bustage
CLOSED TREE