This reverts commit 5992ce90. Builtbot failures with expensive checks enabled.
mentioned in commit 7bd17212