Merge pull request #11687 from betaflight/revert-11659-step-for-conditionally-named...