Revert commit that was not a bugfix (#5301).

I won’t revert in 3.2, since Georg pulled this change in 3.2.2 and
released it.
1 file changed