[TASK] Temporarily avoid VersionState until dropping 6.1