This reverts commit 20b03d65. This shows some failed tests on a bot with expensive checks enabled that I need to look at.