Revert "Alternate default app picker (1/2)"

This reverts commit fc7afd9c41c59e722f4c8c306b10c5ab3cd2a3ff.