Revert 82c1c94..5c5b3ac

This rolls back to commit 82c1c944efb61c7c1f75b6b30397a9e418e506d1.