This reverts commit 4cc85a58, reversing changes made to 90ae445b . Signed-off-by: Rémy Coutable <remy@rymai.me>