Merge "Remove no longer used FLAG_ARCHIVE."