This is the runtime commit for bug #7874.