upstream has another workaround for template