Backed out accidental merge of pre-fix changes to license import controller. closes #778