This will make this a dependency of core too, which it wasn't before... are we ok with this?