Hi, Thorsten, Thanks for your bug report, patch, and for the justification.
I would like to use your suggested patch, but I would like to defer it until the release of trixie. While I don't anticipate issues, it would be better to have it tested at the early stages of forky. I'll decrease the severity level to non RC.