Please submit this upstream and link to the upstream patch submission in a comment in this commit.