Before potentially destabilizing changes in context_split.c