Chris:
I’m pretty sure I just followed the instructions from the link in ahndee’s post above (with the whole “Trash” Device Network ID) and it resolved the issue.
My recollection is that I had a couple devices that I had to do a couple of times, but that I did this and the reran a few “Repair Network” (and let them run for 60+ minutes), and everything finally worked itself out.
Good luck!