https://github.com/meshtastic/firmware/pull/7862/commits/289f90bdbec72096ce9fb99eaf5587827245126a merged a commit that relied on https://github.com/meshtastic/firmware/commit/5b9db81819f45b625683047c3b78bfece8d23b2e but the latter commit was not merged. This does manual wrangling to make sure the same file that exists on develop right now ends up on master.