Revert 3c782ec..a3202f5

This rolls back to commit 3c782ecc6f0f633e3b9bf20bda713ecf663530ee.