Restore comments removed in 83ddf84c1cf4e185a422e8f0937e829f06aad11d