I have this patched here:
It should land in our source tree within the next hour. Let me know if it works.