Reverted a change that would stop the 'Disable On' functionality from working correctly