Revert "friendlier submit app type form (bug 825681)"

This reverts commit 6853eb5070cf367f47f1dd02b02734c91c7a4a88.

This broke the manage payments screen, reverting it for now.