Changes for cb40b98 in snowplow/snowplow