Back out 679e69e79fe2 (bug 965945) for causing C2 bustage on B2G emulator builds. r=backout
Merge backout of bug 965945 from m-c