Revert "NXP-11286 fix bad order"

This reverts commit 9ac9bba70027e3332cff2b5905cd198596411beb.
Revert "NXP-11286 Better escalation from SimpleDocumentModel"

This reverts commit a3dc55a05073bc23f875caf28cdd76decf0c3219.