Revert "Signed-off-by: Matthijs Heblij <heeb@iname.com>"

This reverts commit 5c18499d795b407e6a51ce56c33bef8230c029c4.