Segment: Implement temporary workaround for #1284