This partially reverts 983c158da7723eb00a376bd31db76709da4d0260 Backport of 384f89f8f843953ac11cf211f85291b5c14baeb9 from master
This partially reverts 983c158da7723eb00a376bd31db76709da4d0260 Backport of 384f89f8f843953ac11cf211f85291b5c14baeb9 from master