do we really want this to never expire? if so, why is it behind a switch?