This reverts commit 0e933f76ba4edb0e06f0779f5fb4b0ea85191e8b. The tests for this were broken on centos6 because jinja2 does not have a map filter on that platform. Tests need to be rewritten