Fix earlier merge, part 1