This fixes #7669.  This is the new system class for annotations.