[Objective-C]. revert r220740,r220727