Removed because now merged to core