DON'T MERGE: Remove RemoteCallKey

Fixes #4079 

Can be merged in > 3.4