Revert topic
Merge topic 'use-generator-target' into next

b784762 Revert topic