Revert "Merge pull request #957 from justinfrench/deprecate-error-class"

This reverts commit c5211f61a93dbf0daa34faa93ad95a4e2f5f4832, reversing
changes made to d37f55cdcdc1456b09757b51a2abfa60698b65dc.