Yeah, I was thinking about the core.js changes, but that's independent of this PR.