[Not a 3.2 feature] - Revert "Merge pull request #3361 from wilsonge/application"

This reverts commit bdd83db063c67e152df93f0d547bff635aff15f6, reversing
changes made to ed85b87e792f98ca783c844a06e7a4fd1e2a8aa2.