Back out 5fb550bd0396 (Bug 1034912) for breaking B2G on this CLOSED TREE