Make server an instance variable.

Change-Id: I5039bd6b9d3e524ceefb4260e327924d3ccb026b
Reverting "Make server an instance variable."
Revert "Make server an instance variable."

This reverts commit 2b8b8ad216b579b339b86a5502a4972ebe5dbdfc.

Change-Id: I4995d006de38d32c37a336c886f465d20edcd280