Applied the Sun patch from #6029.  Verified that every case covered in
the Apple patch from this issue was also covered in the Sun patch.