Fixed for v6. I hesitate to cherry-pick this before we have a chance to test it out thoroughly as it changes a number of internals.
Fixed for v6. I hesitate to cherry-pick this before we have a chance to test it out thoroughly as it changes a number of internals.