No feature flag toggle necessary?