Revert template_nested_typemaps to what it was before nested merge

The breaks were fixed in the last couple of commits