3dquiver rebranch

Replaces #2961
Sorry, where did the fix go? I can't see a commit or a PR for it.

I've also recorded the problem this causes as issue #3161.