Partially revert commit a5cc279f53e40