This won't work if you are not using Faraday. Not sure this has really removed the dependence completely. So, bolster the TODO to reference this and we really need to truly get Faraday out of here.