... Apparently I already sucked it in. Doh. This reverts commit 7c8aa2a2c4.
7c8aa2a2c4
from Stanislaw Gruszka