This reverts commit6da57cbc6e, reversing changes made to62b1843704. Also, adjust new code that was written using the "call handler".
This reverts commit6da57cbc6e, reversing changes made to62b1843704. Also, adjust new code that was written using the "call handler".