This reverts commit 05bde305. Reverting due to verifier complaints with expensive checks on build-bot.