This reverts commit rGcd5b308b, rGcd5b308b, rG8cedf0e2. There are issues to be investigated for polly bots and bots turning on EXPENSIVE_CHECKS.