Restart the rebuild

Remove one at a time?
Exactly, may as well.