Bug 1073252. Backout 1051636 for B2G only. a=bajaj