Backout 86b5d8778fc4,fab07b9d6dee,89a059433037,bbb54cde82c3 (bug 897960) due to orange
Merge backout, a=bustage fix