dropping the thor dependency back down for now. Don't think we need the fancier version and it makes us incompatible with some older tools