[tor-commits] [snowflake/main] Remove and restore some comments, after review