Revert 6.1 PvE SAM changes.