This reverts commit 6da57cbc6e, reversing changes made to 62b1843704. Also, adjust new code that was written using the "call handler".
6da57cbc6e
62b1843704