Revert 2434107..ae74fb5

This rolls back to commit 243410730558a3be618c6711dbee96294afa80bd.
comments added (undone)