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