Revert "try to fix issue on RAP"

This reverts commit 149946156d35a9a41280b8bec4cc99fb14af3a0a.
fix shvc