Similar change for uninstall

See 23e5b93650c3e791d42edcaa24a4f8f5f145b224