Merge pull request #18099 from hrwX/issue_fix

fix: Remove whitelisted method