Rolled back unfinished changes to Application class