Revert previous damaged merge

... Sitrus"

This reverts commit ac984db0c702753f7c00ca862a99ac42c2b1c82c, reversing
changes made to 5a7119274d04dee5fa7a52ee6c38308c8b8bf6cc.