Reverted some suspect change in CompositeState.