Undo accidental push of Upgrade WIP

.. pushed untested and unfinished changes for the
   3.1 upgrade process, this push undoes that.