part 2 of 3 of the 2.8 -> 3.0 merge