Fix merge screwup.