This reverts commit b0c1e95a. It
contains a flaw and the next version has more features added which makes
me want to move it to the next cycle.
Signed-off-by: NWolfram Sang <wsa@the-dreams.de>