yeah, i don't see why not. i should add extra tests to make sure that this logic actually works properly, since I suspect that it doesn't actually get invoked regularly in our existing tests.