[t2969] Remove deprecated type option for popup and add fallback for old...

... projects