Revert "Alternate default app picker (2/2)"
Ass its handled by CM now.
This reverts commit 3057e0ed7d490d28c1ae72f379fa6f8b8a41a9b3.