companion to cyclus/cyclus#861

This is a nontrivial change. I would feel more comfortable if we had regression tests...