fix from master backported to 4.4 db upgrade path

	hand picked from 774739fb97f0951aacf566e23b0d3782035c385a