Ouch. Will submit something upstream for this.