r9754: Upgrading with the command line utility now works, at least partially (-: