Revert "Reversed default app picker: fix FC"

This reverts commit 1844294ec958cbfa4f4fccb0ff855f0cc2132130.