This fixes #8355.  It now replicates annotations.