This fixes #7783.  The changes have been made.