Revert the previous change, because it broke the regression test.