undo exceptions_app because of timeout issues