Fix a bug where the server_id needed to be passed.

Change-Id: I100b4e73261b7b4826ab8e5c384b73b7a14affdf