Revert "SaberMod fixes"

This reverts commit a2369e5ef7a46becb4e78cdff61b5d3dbf4c3b2a.