Comment # 4 on bug 1037126 from Michael Matz

Actually we can propose to make that change upstream as well, then we wouldn't
deviate :-)