Great Changes: using define replace original parameter,this may cause error
Revert "Great Changes: using define replace original parameter,this may cause error"

This reverts commit 187aa4b9f982b3033ce1a15556ca7ff2c096f91f.