Reset for minimal upstream changes