Revert "Fix call hook handling"

This reverts commit 9e5fdf12319889e65a27a0d17d96ee491af2e8d6.