revert last patch (the behaviour is a bit more complex than that, since we
actually really discrard the physical definitions when we do "save all"), and
just use better wording instead