This reverts commit e55410f8. This is failing on EXPENSIVE_CHECKS buildbots
mentioned in commit 184a13d3