Revert last commit and add comments.