Resubmit r256193 with test fix: assertion failure analyzed