Attempt mac fix.
Merge topic 'use-generator-target' into next

954376b Attempt mac fix.