Resetting to match upstream