This reverts commit 7893fb79, reversing changes made to 28438e30 . Signed-off-by: Rémy Coutable <remy@rymai.me>