jlebar added a comment. This takes it back to how it used to be before I regressed it, which I think is good enough for now. If we want to revisit how we make this work for offloading toolchains in general, we can do that separately. https://reviews.llvm.org/D27316