Revert 4aecd0e..43475ec

This rolls back to commit 4aecd0eee2219776e87ab4bc181d9a5a0ec6109a.
Better comments. Fixed stupid mistake.