rolling this out as 3.4.2, not 3.5