Leaving the note that this has moved to core