Rolling back some changes.

Rolling back some changes, improving a variable name and adding an extra
comment.