Per Ed's comment on T50605:
Above change fixes issue with annotations being dropped, but we still need to fix empty annotations not rendering (e.g. <span style="display: block; background: red; width: 100px; height: 100px;"></span>), either here or in a new bug.
This is the new bug. :-)