Will address this issue in a separate changeset where I will clean up all our examples.