revert patches and other stuff