Revert "Better support for application's reset"

This reverts commit d49495c82c1b4cb408eb1af3f1329c41b1a452f8.