Fix #25471: Brackets always added to first staff

[XiaoMigros]

Resolves: #25471

Seems some of the code previously removed was necessary after all. Thanks @sammik !

• I signed the CLA
• The title of the PR describes the problem it addresses
• Each commit's message describes its purpose and effects, and references the issue it resolves
• If changes are extensive, there is a sequence of easily reviewable commits
• The code in the PR follows the coding rules
• There are no unnecessary changes
• The code compiles and runs on my machine, preferably after each commit individually
• I created a unit test or vtest to verify the changes I made (if applicable)

[mathesoncalum]

Seems some of the code previously removed was necessary after all.

Ah, was worth a try...

Just one suggestion - I'd still prefer the changes suggested here for readability reasons. There's just a smidge too much going on in one line right now for my liking (sorry I know that's a real nitpick).

Thanks!

[zacjansheski]

Tested on MacOS 14, Windows 11, Ubuntu 22.04.3. Approved
#25471 FIXED