Reverted fix 6d0f490138c0e77cd563af5a8ca6ba17b720d526, but keeping the testcase in the testsuite.