Revert "Fixing unresolved"

This reverts commit 3f491275ca7115d1c307b24a6be3fa55ab0af871.