Patches to allow aborting a rebuild after 5 minutes.