I'm questioning why we even need to put this behind a switch? If we do, it shouldn't be a ```performance``` switch and the description below should be changed`.