Revert 0411c6b..58a2efd

This rolls back to commit 0411c6b66d096ad0fa54d94bc29eb305e753bece.