Rebasing the audit/next tree