Re-enable fix for early context event publishing