diff --git a/apiserver/apiserver.go b/apiserver/apiserver.go
index e5f95b58..873a1499 100644
--- a/apiserver/apiserver.go
+++ b/apiserver/apiserver.go
@@ -80,12 +80,10 @@ func NewServerRunOptions() *ServerRunOptions {
 }
 
 func (serverOptions *ServerRunOptions) Run(stopCh <-chan struct{}) error {
-	// Set ServiceClusterIPRange
-	_, serviceClusterIPRange, _ := net.ParseCIDR("10.0.0.0/24")
-	serverOptions.GenericServerRunOptions.ServiceClusterIPRange = *serviceClusterIPRange
 	serverOptions.Etcd.StorageConfig.ServerList = []string{"http://127.0.0.1:2379"}
 
-	genericvalidation.ValidateRunOptions(serverOptions.GenericServerRunOptions)
+	// TODO(sttts): unify signature of DefaultAndValidateRunOptions with the others
+	genericapiserver.DefaultAndValidateRunOptions(serverOptions.GenericServerRunOptions)
 	if errs := serverOptions.Etcd.Validate(); len(errs) > 0 {
 		return utilerrors.NewAggregate(errs)
 	}