revert some patches