Revert "Fixing mess"

This reverts commit 4d3690f6d0683910b819d4467bde24108cf393c1.