This reverts commit eb5ecbbc due to failures on buildbots with expensive checks enabled.
mentioned in commit 571c7d8f