Feature flags disabled

@Kartones this is the simplest patch, I think. CR, please...