Update comment, add back removed lines we actually want to keep