Revert "SAK-26043 merge 307871 308244 to 10.x"

This reverts commit 537f9678793f5c7f798915bc96d5e01566f79407.