Merge "Remove unused codepath."