Revert "Save unordered changes: to total disaster"

This reverts commit 5d60f1f850c4a021e9eac081625d078fa69ee9a0.