Remove dead code from r212620