This now allows the 'add annotation' feature to be turned off.  bug #8313.