Fixes PR objc/1236