Returned back fbb85cf (Better performance in ScClsStubBuilderFactory)