This is a fixup for a bungled commit in the previous checkin.