Corect commit in go-team branch 106bdb0c43574b4bacc400d971bfaf1028d98fdf.