Revert "changes by rahmet"

This reverts commit 1609f4eb47c771bf112c02ab3e9ee21346eb310e.