Back out c36fb08a0ec0 (bug 965945) for causing C2 bustage on B2G emulator builds. r=backout a=me