Remove a weird redefinition of controller_hostname.

Can't imagine what this was about.

Change-Id: I26fe1ca99b512cb90e331a076c72ea6cc759744a