CodeGenModule changes have been committed upstream