This reverts commit 5d440f2da26469b3379729d0d99201838b99ffb5.
Signed-off-by: Marko Korhonen <marko.korhonen@reekynet.com>