Partially revert commit 4387a1562