Revert "Fix regression tests"

This reverts commit b12367e5c36fb8f0e04f850ca49e4466602033c3.
Fix regression tests, take two