Do we really want to keep the "legacy" output?  I'd prefer deprecating now, with a warning if we want to make a soft landing.