This reverts commit 99f1c30071e770a30abfb86b00e5aaf2dd150253.
@@ -12,7 +12,7 @@ import (
"net/http"
"net/url"
- "context"
+ "golang.org/x/net/context"
"golang.org/x/oauth2"
"github.com/grafana/grafana/pkg/bus"
@@ -4,7 +4,7 @@ import (
"strings"
"github.com/grafana/grafana/pkg/setting"