Re-apply areSameItem change to latest version