UNTESTED: can't test until #87 is resolved (hopefully by #93).
This should revert commit 2a05400e232e14f0d4c1cbfb548a0871ea57bd44. I have no idea why I did that, but if the reason emerges after the revert, we should address it in some other more sensible way.
UNTESTED: can't test until #87 is resolved (hopefully by #93).This should revert commit 2a05400e232e14f0d4c1cbfb548a0871ea57bd44. I have no idea why I did that, but if the reason emerges after the revert, we should address it in some other more sensible way.
Fixes #83 and #89.