Remove the database upgrade - far more sensible to keep it as it is, at least to begin with.