Revert "Fix bug #9952"

This reverts commit 39a5a111c723d9744bc441d734c5c6caf6282d79.
The fix is not correct