Revert "Merge pull request #47 from kevinburke/application-with-all-options"

This reverts commit deb379296ed1f37be5c87dbccf3a7c59901872ec, reversing
changes made to 8387d59a6cfd6a74e44f820e53850bbf44d4eb0e.