@srowen do you know how stable this fix will be across different versions of `hadoop-client`?