As in the other PR: this should be a patch and submitted upstream.