re-enabled support for mapping.{template,path}