main
Revert "Improve output when wrapping functions" (#15979)
Avoid using CJS globals in internal source files (#12963)