Manually reverted fa6aac2ab19762775fba78c264159efb4fcf3ecf