Arg, one more update to bring it back to o.js instead of o-core.js.