Fixes #5435: Allows upgrade to boot on old schemas

Upgraded my 1.7 install fine.