I've moved this feature into the core