Merge "Revert "Mitigate the races during installation.""