Models are no longer used during the upgrade process.
Merge branch '3.4'

* 3.4:
  Models are no longer used during the upgrade process.