Fixes a regression from 8b309adb43 (#11660) and b65acead42 (#11752) where events which themselves were an edit or an annotation could have bundled aggregations calculated, which is not allowed.
8b309adb43
b65acead42
