Rolled back comment changes from this branch.