Fix for <rdar://problem/5585334>