This reverts commit ef47b625.
The parent commit 07ba5560
which is a backport of
mysql/mysql-server@1198267c331b045b9cad26be72b1a5b4f8930a79
fixes the issue differently.