This commit cleans up the feature flag. Changelog: performance
Attach a file by drag & drop or click to upload
