Revert "Fix: Possible fix for pull request conflict"

This reverts commit 69763adebb649d4bebbd70a7d76e2df506f9da0b.