Revert obsolete files back to upstream