Temporary 'domain template fields' were actually not necessary in the last commit. These are removed again.