diff --git a/mysql/files/Debian-my.cnf b/mysql/files/Debian-my.cnf
index 1d88312..2d0c540 100644
--- a/mysql/files/Debian-my.cnf
+++ b/mysql/files/Debian-my.cnf
@@ -1,4 +1,4 @@
-{% from "mysql/pillar-settings.jinja" import server %}
+{% from "mysql/pillar-settings.jinja" import server with context %}
 # This file managed by Salt, do not edit by hand!!
 #
 # The MySQL database server configuration file.
@@ -46,7 +46,6 @@ skip-external-locking
 #
 # Instead of skip-networking the default is now to listen only on
 # localhost which is more compatible and is not less secure.
-{{ if pillar
 bind-address		= {{ server.get('bind-address', '127.0.0.1') }}
 #
 # * Fine Tuning
diff --git a/mysql/files/Gentoo-my.cnf b/mysql/files/Gentoo-my.cnf
index a413824..ecb0c39 100644
--- a/mysql/files/Gentoo-my.cnf
+++ b/mysql/files/Gentoo-my.cnf
@@ -1,4 +1,4 @@
-{% from "mysql/pillar-settings.jinja" import server %}
+{% from "mysql/pillar-settings.jinja" import server with context %}
 # This file managed by Salt, do not edit by hand!!
 # /etc/mysql/my.cnf: The global mysql configuration file.
 # $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/files/my.cnf-5.1,v 1.4 2013/01/20 02:40:02 robbat2 Exp $
diff --git a/mysql/files/Ubuntu-my.cnf b/mysql/files/Ubuntu-my.cnf
index 4cc7440..7e10c64 100644
--- a/mysql/files/Ubuntu-my.cnf
+++ b/mysql/files/Ubuntu-my.cnf
@@ -1,4 +1,4 @@
-{% from "mysql/pillar-settings.jinja" import server %}
+{% from "mysql/pillar-settings.jinja" import server with context %}
 # This file managed by Salt, do not edit by hand!!
 #
 # The MySQL database server configuration file.