diff --git a/mysql/files/Debian-my.cnf b/mysql/files/Debian-my.cnf
index 2d0c540..2ec3049 100644
--- a/mysql/files/Debian-my.cnf
+++ b/mysql/files/Debian-my.cnf
@@ -1,4 +1,3 @@
-{% 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.
@@ -34,10 +33,10 @@ nice		= 0
 #
 # * Basic Settings
 #
-user		= {{ server.get('user', 'mysql') }}
+user		= {{ salt['pillar.get']('mysql:user', 'mysql') }}
 pid-file	= /var/run/mysqld/mysqld.pid
 socket		= /var/run/mysqld/mysqld.sock
-port		= {{ server.get('port', '3306') }}
+port		= {{ salt['pillar.get']('mysql:port', '3306') }}
 basedir		= /usr
 datadir		= /var/lib/mysql
 tmpdir		= /tmp
@@ -46,7 +45,7 @@ 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.
-bind-address		= {{ server.get('bind-address', '127.0.0.1') }}
+bind-address		= {{ salt['pillar.get']('mysql:bind-address', '127.0.0.1') }}
 #
 # * Fine Tuning
 #
diff --git a/mysql/files/Gentoo-my.cnf b/mysql/files/Gentoo-my.cnf
index ecb0c39..63503bf 100644
--- a/mysql/files/Gentoo-my.cnf
+++ b/mysql/files/Gentoo-my.cnf
@@ -1,4 +1,3 @@
-{% 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 $
@@ -46,8 +45,8 @@ err-log						= /var/log/mysql/mysql.err
 # add a section [mysqld-4.1] or [mysqld-5.0] for specific configurations
 [mysqld]
 character-set-server		= utf8
-user 						= {{ server.get('user', 'mysql') }}
-port 						= {{ server.get('port', '3306') }}
+user 						= {{ salt['pillar.get']('mysql:user', 'mysql') }}
+port 						= {{ salt['pillar.get']('mysql:port', '3306') }}
 socket 						= /var/run/mysqld/mysqld.sock
 pid-file 					= /var/run/mysqld/mysqld.pid
 log-error 					= /var/log/mysql/mysqld.err
@@ -67,7 +66,7 @@ language 					= /usr/share/mysql/english
 # security:
 # using "localhost" in connects uses sockets by default
 # skip-networking
-bind-address				= {{ server.get('bind-address', '127.0.0.1') }}
+bind-address				= {{ salt['pillar.get']('mysql:bind-address', '127.0.0.1') }}
 
 log-bin
 server-id 					= 1
diff --git a/mysql/files/Ubuntu-my.cnf b/mysql/files/Ubuntu-my.cnf
index 7e10c64..406f05d 100644
--- a/mysql/files/Ubuntu-my.cnf
+++ b/mysql/files/Ubuntu-my.cnf
@@ -1,4 +1,3 @@
-{% 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.
@@ -34,10 +33,10 @@ nice		= 0
 #
 # * Basic Settings
 #
-user		= {{ server.get('user', 'mysql') }}
+user		= {{ salt['pillar.get']('mysql:user', 'mysql') }}
 pid-file	= /var/run/mysqld/mysqld.pid
 socket		= /var/run/mysqld/mysqld.sock
-port		= {{ server.get('port', '3306') }}
+port		= {{ salt['pillar.get']('mysql:port', '3306') }}
 basedir		= /usr
 datadir		= /var/lib/mysql
 tmpdir		= /tmp
@@ -46,7 +45,7 @@ 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.
-bind-address		= {{ server.get('bind-address', '127.0.0.1') }}
+bind-address		= {{ salt['pillar.get']('mysql:bind-address', '127.0.0.1') }}
 #
 # * Fine Tuning
 #