Revert 97ecec6..9b17031

This rolls back to commit 97ecec6ceb332c6711430a773f06e9d870bcc2e5.