Also get rid of the preexisting shim in server.go that existed before to have this name just call the unexported one.