Recreating tag to match current 3.0.x