Revert ":Sordid is better"

This reverts commit 7aa1ce16f38f4775dc23a179f235567797650bb4.
merge after revert