Revert "Revert "Removed cdata""

This reverts commit 2c77897e9bdf2d1e811f708701b96d0e711c6744.