Revert "Merge pull request #3965 from jack-fractal/dev"

This reverts commit fa57b76f25ea9d00fb92c034464ab540e0fb387b, reversing
changes made to 40ee2278ede129f09f6458370f647ec86082da92.

Signed-off-by: Mloc <colmohici@gmail.com>