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

1446b08 Attempt mac fix.