Back out 50f2a49570ce (bug 1085027) on suspicion of making Win7 opt mochitest-4 permaorange, a=backout
CLOSED TREE
Merge mozilla-central to mozilla-inbound to fix perma failures on a CLOSED TREE