Backed out changeset 0addc6532f62 (bug 923600) for b2g bustage