Backed out changeset 132909245ca8 (bug 1096494) for causing merge conflicts to m-c
Backed out changeset 7fa6291d952d (bug 1095257) for suspicion of causing jit tests