Fix the initial DB build / upgrade mis-match.  This should get us back
to where a fresh install works again.