Revert "add more patches"

This reverts commit 76f0a5e235edb66cbd7a9605f70735c5f5a4abf4.