Undo the mess, and do the easy thing, reset Accounts just as we should be doing.