Try to fix the build after r173383, part 3.