This change is fine, I think, but is it supposed to be part of this PR?