Bleah! Yes that looks wrong (and always has been) - unrelated to this commit though.