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