Getting rid of 'rebuild' boolean requirement