...
Created attachment 401011 [details] Patch
Comment on attachment 401011 [details] Patch commit queue is very slow. Upstreaming changes manually.
Fixed through r262534 (unreviewed).