Rollback 'notification_wait_response' for backward compatibility

No match.