The previous commit was not a good backport, as I did not check the
new test case. Now the test case has been updated, and everything
should work.