Revert "Try flags that worked well in SaberMod"

This reverts commit ae9a43e67185463c0490acde569f5d4f38cc21b2.