Just an FYI, there is also some work in the bootstrap branch that's related to this. Maybe there's a better solution in there?