Regressed back to v3.