Reverting because this is causing failures on bots with expensive checks enabled. This reverts commit 73cea83a.