Backed out changeset 1d4ec2065398 (bug 990202) for b2g-desktop failures on a CLOSED TREE