Fix for MNT-11408 - change to use the only 'safe' Thor only codepath to avoid early THOR data hack from THOR-293


Former-commit-id: 649ae8e776d088729ea8a7234b0e1bf71d622f69
Former-commit-id: ccf900c7a6f55f876af72452e8425906d65c71b6
Former-commit-id: b16d2ccfc608de8bcc446538dff082ff86203758
Former-commit-id: 480414912bf854278b9f7d8e0aeff90fbea8d1cd
Former-commit-id: fd4a1275bcece7182363ac682eb356b7519b6f6f
Former-commit-id: d4b0312b8f922328938ac7b577dec025090f3954
Former-commit-id: 64a42061fccc5f1bdf79d70ef5f7961743ca9f7d
Former-commit-id: f88c45caf579b95862ac5a8cadc4b10dc1e0a283
Former-commit-id: 3419cbab8d479136608ae1e5c25cbe70545a89fd
Former-commit-id: 7a59c883fdcf22f8ee414ffb0160078de412359b
Former-commit-id: 6f716c9dd6668ab94be03b003bb110ad8afb1b45