Add workaround back in, problems still happening.