We will revert this later, for now it's only a stop-gap solution, until we figure out how to toggle this correctly