I don't understand, why is this part of this commit? If it's needed, shouldn't there be a test for it?