Reverts some of the portfolio-template-picking logic in ee7da82

It will be introduced in a future feature release. See #780

This should fix the regressions in #858