Cleanup of incorrect feature flag in #5000.