Ah, ok.  Makes sense to replicate the upstream diff.