Shim underscore so that we touch less code.