Revert install-server vs. controller