This was just fixed yesterday on master - will be out Friday in 1.10.0.dev5 and it's being cherry-picked to 1.9.x and - maybe 1.8.x