After conversations in #1215, we need to catch up with the code that was previously
produced before we set the features flags requirements.