Temporary workaround for #2224: recombine StaticParts afterwards