Fixed recently introduced bug
@gregory.ashton @cjhaster @matthew-pitkin @paul-lasky @colm.talbot
This is a bug I introduced by accident and made it onto the 0.4.5 tag. It will crash the run in some cases. I can't reliably reproduce it, unfortunately. This just reverts it to the previous (working) state.