Wondering if we actually need this in core, if we never use it in core?