copy the cas fix to master the low-tech way.