Revert dd94ca6..7e4d964

This rolls back to commit dd94ca6bd598459c1a9b65641f865d5633607e66.