fixup bugfix 21758 (commit 186e66cec6519606bca5e07209c9a557c78b5e71)