Merge "Remove reference to dead-end IntDef"