Roll out r34020 as it causes recursion tests to fail.