Revert fix, but add a comment.