Revert a recent change. Otherwise some tests break in FAST_COMPILE and we end up with not as much optimized code.