I bisected this down to the erratum fix added in commit a769cbcf. From
what I can tell, the erratum only applies to CS4207, so I'm attaching a
patch to make the fix conditional. CC'ing the author of that commit to
verify that this is correct.
Cheers,
Arun