Revert "Tolerance and Commenting"

This reverts commit 8a49241c0e430e2bfdf4e34d306fc08c9db554e6.