Revert "Issue #3046693 by thalles: Works best with a default CKEditor image upload feature disabled" This reverts commit 16fc08c2.