Adding the new rebuild implementation that uses the locking.