Fix 3.0.x nightly