[#85002200] Revert of dbb15661b4892abeb229eb4b9c43a631460a71c4