Backout the patches that landed for bug 827280 due to bustage.
Merge backout, a=bustage fix