Not sure I follow, and this is core code. Why is this change needed?