Re-do of 644c2ff (reverted in d8c907e) which does not include the --force 'reinstall everything' option