Reset changes to fully match upstream