Backout bug 893301 for b2g bustage r=me
merge backout
merge backout a=bustage