Back out c93c3f52689c (bug 904170) for b2g desktop bustage
CLOSED TREE