Revert "MrMyk's commit"

This reverts commit d29a94fe0c9e40a8299940cbb3504b7ca951b34e.