Restore accidentally removed condition to association template