902869 - more robust handling of --force unregistration.