Revert "Merge remote-tracking branch 'remotes/origin/MP1-4410-BUG-Crash_MP_or_Configuration_when_xml_files_is_corrupt'"

This reverts commit d9c4441a33b384700035de59ebe6ddf0736df0b4, reversing
changes made to b35cccebd47d473d85c5c5a37494aadf8e2cee4d.