Merge "Fix another case of un-verified dead code."