Restart the rebuild

Good job Steve, I feel I should send you a cigar!