This reverts commit 231b486e4946c7b406173d49e6848e72d0b4b1ae. There was regressions reported in tools/generate_and_run_more_tests.sh.
This reverts commit 231b486e4946c7b406173d49e6848e72d0b4b1ae. There was regressions reported in tools/generate_and_run_more_tests.sh.