This reverts commit b93b90ff, which
was commit 0ef38d70 upstream.
It was intended to fix a regression which never occurred in 3.2.