Revert "Merge remote-tracking branch 'remotes/origin/MP1-4359-BUG-MP_exit_procedures_are_executed_in_wrong_order'"

This reverts commit 711f33e845d05ff817775e63e086c4be5c98c4d4, reversing
changes made to e40ba49d206e2a6d14d5669974af45dc757327b2.