Revert 1df3990..1cc9682

This rolls back to commit 1df399059baabb2ce2b8c64781301a8daab344ea.