Backport "fix: don't add suffix if brackets already present" to 3.5.2#21461