Revert "use shared code for safe wrapping, rather than calling wrapMethod on non-methods (#4640)"

Revert "use shared code for safe wrapping, rather than calling wrapMethod on non-methods (#4640)" #13929