This reverts commit de37c06f01 to de37c06f01 It still breaks EXPENSIVE_CHECKS build. Sorry.
de37c06f01