Remove the monkey patching of _ into the builtins

Previous _ was monkey patched into builtins whenever
certain modules were imported. This removes that and
simply imports it when it is needed.

Change-Id: I0af2c6d8a230e94440d655d13cab9107ac20d13c
Merge "Remove the monkey patching of _ into the builtins"