This one should prevent the previous issues, and be the one true fix for rdar://21949558 llvm-svn: 243367