Since this was observed in relation to #3296, I suspect it would be reasonable to handle them together.