This reverts commit 3807c80eee9a3df26773860472b422d4e72d16d6. Signed-off-by: Giovanni Fabiani <fabiani.giovanni@gmail.com>