cool, @magnusvk and @wbinnssmith say this is the only path we use right now to charge an order, so i'll go ahead and merge this much for now.