Revert r45387 "Add special case handling of the XHTML character entity "'" to...