Backed out changesets 6c523ffe2a33 and 5f9bcb5dc193 (bug 891756) for suspicion of breaking B2G tests. a=backout