Merge "Fix comment referring to nonexistent ElementDeleter"