Again, this is a correct fix, but should not be part of this commit.