Merge "Revert "Make subs alter flags when rn is an immediate""