Bad bug broke schema upgrades

Change-Id: Iba04155d8ed7332b99d9acec539622b1662af91c