CURRIKI-6657: Workaround for missing affiliate choice...
paul