This fixes #7468.  Everything has been rebuilt.