[m2043] Revert commit 06f9f7dc35608a4c476ca79821d3c9b9e56f4f5c