Revert "Replace error check with 60 second timeout."

This reverts commit 1e38539647cc7de49177a6ea3e51c9abff69cb6b.