Fix backward compatibility with upcoming event feeds