Revert "Merge branch 'jc-operations-service-call-hook-rpcs' into 'master'"

This reverts merge request !2034 (merged)

Currently it breaks our master branch, so let's revert and rever the revert later.

cc @johncai