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

976e5c93 Revert topic.