Revert r186649 because it wasn't unnecessary and add a comment.