This fixes #8389.  The viewer now works.  Exporting also works.