Set files back to match upstream/master