Do not land this patch until `webmaker-events` is landed + tagged then we use the new tag on this line.