Making this change upstream