Revert "patching some files manually"

This reverts commit bf495fc5a1afeec006c9425ba23b91b65bb24d1d.