This fixes #7816.  It really is fixed this time.  ;)