Back out 4bb5a77c36a6:88a3198c7007 (bug 900669) for b2g build failures
CLOSED TREE