This reverts commit c425f366, reversing
changes made to 82f6c0f5.

Signed-off-by: Rémy Coutable <remy@rymai.me>