Backed out changeset de4503ebba6a (bug 968222) for causing m2 test failures on B2G ICS Emulator Opt on a CLOSED TREE