Proper support for 2.1.1 upgrade