Bug 9003 follow-up: add fix to CCSR