Merge "Revert " Removed unused scaling rpc handler code""