Revert "patching some files manually"

This reverts commit ef6ed43d18e91acb119bd197d1628f71cd8c5f73.