Should fix #89, at least for now.  Though it's an admittedly ugly workaround
Changelog entry [skip-ci]