Moved to 'core'.