actually, this is something that i can potentially spend some time weeding out of #5815 as well, potentially with far less effort, and do later