Second attempt at removing gen/.