why can't they keep the cdata correct?

Change-Id: I3d00b7acea710cc90b11a6bc2641f20f5f28bfec