Revert some patch