This reverts commit 71ebcb85b931f43865df5b322b2cf06d3da23f69. Backport of 976bd519a879b2fd7a356cb21bde32696adb545f from master
This reverts commit 71ebcb85b931f43865df5b322b2cf06d3da23f69. Backport of 976bd519a879b2fd7a356cb21bde32696adb545f from master