Reverted the code part of r16696, my patch for <rdar://problem/4641262>,...