Backed out changeset 46d81f906852 (bug 1085759) for b2g device problems on request by QA