Fix DS-1596 for 'template' theme.