diff --git a/conf/grafana.ini b/conf/grafana.ini
index 2d643191b4a..491dfd1063b 100644
--- a/conf/grafana.ini
+++ b/conf/grafana.ini
@@ -2,12 +2,18 @@ app_name = Grafana
 app_mode = production
 
 [server]
+; protocol (http or https)
 protocol = http
-domain = localhost
-root_url = %(protocol)s://%(domain)s:%(http_port)s/
+; the ip address to bind to, empty will bind to all interfaces
 http_addr =
+; the http port  to use
 http_port = 3000
+; The public facing domain name used to access grafana from a browser
+domain = localhost
+; the full public facing url
+root_url = %(protocol)s://%(domain)s:%(http_port)s/
 router_logging = false
+; the path relative to the binary where the static (html/js/css) files are placed
 static_root_path = public
 enable_gzip = false
 
diff --git a/pkg/setting/setting.go b/pkg/setting/setting.go
index 241f820ca6b..0212d719e5b 100644
--- a/pkg/setting/setting.go
+++ b/pkg/setting/setting.go
@@ -204,11 +204,6 @@ func NewConfigContext(config string) {
 	HttpAddr = server.Key("http_addr").MustString("0.0.0.0")
 	HttpPort = server.Key("http_port").MustString("3000")
 
-	port := os.Getenv("PORT")
-	if port != "" {
-		HttpPort = port
-	}
-
 	StaticRootPath = server.Key("static_root_path").MustString(path.Join(WorkDir, "webapp"))
 	RouterLogging = server.Key("router_logging").MustBool(false)
 	EnableGzip = server.Key("enable_gzip").MustBool(false)