Revert "Many SR fixes and tweaks"

This reverts commit 350b708d2922ccfef7386e4413f42fce4f41fdc9.