Revert 0e8bd91..3e8dab6

This rolls back to commit 0e8bd91d9f8984560040d30a6905c2ea0ff861b5.