This was fixed internally, making a patch.
Created attachment 130166 [details] Patch
Landed in r109783.