This reverts commit beb9885b038d66be4216a823750b33977b4fb86a.

# Conflicts:
#	web/documentserver-example/php/doceditor.php