Backout cset f1c86ed4ccfa (bug 977455), a=bustage
Backout cset 0d71b60afe52 (bug 977448), a=bustage
Backout cset 4c4041cfc095 (bug 977454), a a=bustage
Automatic merge