Merge "NFC: remove unnecessary branching" into main