Also: please submit this upstream and link the submission here.