Start of rebuild for ntlm