Some files reverted to upstream repo