fix upgrades from very old 2.3? RT#21543