Revert 5bbbcd9 and fix conflict with TinyMCE body class.

Oops, now I know why it was done the way it was done before,
unfortunately the test coverage that exposes that is in
Products/CMFPlone/tests/browser.txt.

Conflicts:
	plone/app/layout/globals/layout.py