Revert "Fix derp"

This reverts commit 7e98ada626db1ea6b3913c568d427d323398af78.
Revert "Alternate default app picker (2/2)"

This reverts commit bc9873337c3f02a4718f670a7a5df5ac4ccebea3.

Conflicts:
	res/values/strings.xml