Preferably this would be an opt-in feature, but let's not get too optimistic about things