Back out bug 813978. a=bustage
Merge backout. a=bustage