Upstream suggested an alternative (more correct) fix. I'll rebuild the KMP with that patch. Stay tuned.