Disable 'ControlPersist' for the time being