Revert "SaberMod fixes"

This reverts commit d1407a6091a86403b3390d2b347905fa47283422.