This fixes #8313.  Annotations now work.  They can be added, and they show up on the graph.