Revert "Merge pull request #94 from PotatoDumplings/interesting_comments"

This reverts commit 9915ca76254b439834901479bace838c93865275, reversing
changes made to 11fbb2fc349bbe1bff23345a50d24560b8ee38b1.

Conflicts:
	r2/r2/lib/db/tdb_sql.py
Merge branch 'master' into staging