Revert "regressions for 701082 and 701082" breaks the test suite

This reverts commit 4b75447fcf50743d4e56a045b89a4038e05960f2.