The previous merge e87c59e was missing a hunk.