This reverts commit 60d6eb0b5d. There is already a full patch (D3118) by brecht for this, will leave it up to him.
60d6eb0b5d