Fix the non-splice build.