Backed out changeset 2a89253c22cc (bug 939080) for Desktop B2G bustage.