Copying my main.cf.erb changes into the EL6 one
Revert "Copying my main.cf.erb changes into the EL6 one"

This reverts commit 9a3b1fc759518db5e249248536f4a6c1e9001978.