Revert "SU Fixes"

This reverts commit 6f6b00d42fdc481b4f6f4f31b525e0ed457bf221.