This fixes #7442.  The output labels were also not getting saved.