Revert refactoring of ClientRMService and RMAppManager