This reverts commit 63974e4d, reversing
changes made to ab524a54.

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