Revert cli export, yet fix the amportal.conf generator