No directly related to this PR but the comment at the top of this looks wrong?