Move this formula to the new style map.jinja. Still need to sort out RedHat handling, but it's not any worse than it was before (i.e. horribly broken)