Revert "Removing comments from the previous throw away patch"

This reverts commit 6d47463ade25241f49599feec5dd31f0fe042cbf.
Revert "Revert "Removing comments from the previous throw away patch""

This reverts commit 26d0e80cb19829863618287b66e0af24acc7d9b2.