ENG-6881: Or, don't overcomplicate things?