Wondering if this should be a flag so we can turn it on in prod for whitelisted only users.