This reverts commit 2b13fea1
assigned to @walle
mentioned in commit 1829d20e
merged
unassigned @walle