Reverting code due to the way RS handles their own (Valid) overrides
Fixes to properly handle some automated tasks