Partially revert commit 0cd592bb25