Temporary revert r221818 until all the problems
with objc stuff will be resolved.