This needs to be reverted as it is within LEGACY_EXEC (I believe)