Wondering about the same thing.
Would you be willing to accept a PR to backport this fix to branch 1.2?