Revert "back ported MDL-38923"

This reverts commit 7d8488549440ba04ef8a87bbb537df4ead60446d.