Revert "wave server name from CoreSettings"

This reverts commit c946e2283209ed013359bd0993f57a9bb7aab17f.