Revert to d87f620c985c3f0975ecbf35819676b30103d2d1
Add retryAfter to error object