XCOMMONS-636: Observation manager does not fully overwrite existing event listener