Make it closer to v2.1.x for consistency