This seems... odd? I don't know a whole lot about this area of the code, and I'll accept that this is necessary the way our infrastructure is, but, should we really have to do this?