Reset to match upstream