Add back support for notification on timeout