Back out "[RPC] [Minor] RPC entry point cleanup"
Summary:
Original commit changeset: b509c47fb612
(Note: this ignores all push blocking failures!)
Reviewed By: xush6528
Differential Revision: D21669711
fbshipit-source-id: e452a513a2d22eaa3bffa333fdb3277fabc24b41
