[m2382] revert commit 9599d4a29bf881ceb0cb8071fd47de5090827de7