Tweak feature flag again