Revert the fix for line 598, it was not a fix as it should be.