This reverts commit 6b7b064492ddf339d0213779fb84d50ee3dc5eb7. Signed-off-by: Daniel Golle <daniel@makrotopia.org>