This fixes #8369.  There is a much more generic way to save reports now.