Objective-C. Revert my patch in r211234.