Revert commit from other PR