Backout 941bee559cd7 (Bug 980647) due to critical regressions on b2g