this fixes #89 and adds a new feature flag (0.35) to activate the new
behaviour.