[PATCH 08/11] Use a more robust method for removing previous autopart. (#868589)