Reverse portion of ddfd58779a
Reverse portion of ddfd58779a

* Error check was more subtle than realized. `*Error` implements `error`
  and should be allowed to pass-through without wrapping.

SpirentOrion/luddite