Revert r174043 and tweak the comment wording so I'm (hopefully) not confused by it again!