Revise r126127 to address Daniel's comments. <rdar://problem/9012638>