This reverts commit 715959c1713b91b9df5adeb08aa9aab8e3ba3a22. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>