Let's partial revert this previous 4.9 Super Dirty hack since we fixed it in the compiler - thanks to me :D

Signed-off-by: Hieu Phan <aznrice2k4@gmail.com>