Fix bug 967, Windows rearranging after reconcile save.