Upstream AWS provider issue workaround