Revert of #251 - turns out this doesn't fix #240