STweaks: Revert revert