This caused some failures detected by the buildbot with expensive checks enabled. This reverts commit 4067de56.