Revert #3358

Reverts #3358 

Sorry @halkyon, some elements of the CMS rely on encoding HTML in checkboxes manually (see add new page).