Please submit this upstream and link the upstream pull request here.