Revert and proper fix to comments