reverted RPC interceptor related modifications.