if let is no longer behind feature gate