Merge part of r246985, which disables this assertion

llvm-svn: 253380
2 files changed