I don't understand this comment.  (or why we're adding new commits to this bloated PR)