I wonder if putting it behind a feature flag would make sense or be annoying.