Backed out changeset e2c75ec7f3d4 (bug 959787) for breaking b2g builds on a CLOSED TREE