Do we need these changes in core?