Comment # 5 on bug 1209245 from Olaf Hering

I think we need 1e454c2b5b1172e0fc7457e411ebaba61db8fc87. Not sure why this was
not backported upstream, likely because it is a tools change ...