diff --git a/mod/assign/submission/onlinetext/locallib.php b/mod/assign/submission/onlinetext/locallib.php
index 87fcc1938ec..0102f2e9900 100644
--- a/mod/assign/submission/onlinetext/locallib.php
+++ b/mod/assign/submission/onlinetext/locallib.php
@@ -140,10 +140,6 @@ class assign_submission_onlinetext extends assign_submission_plugin {
 
         $onlinetextsubmission = $this->get_onlinetext_submission($submission->id);
 
-        $text = format_text($data->onlinetext,
-                            $data->onlinetext_editor['format'],
-                            array('context'=>$this->assignment->get_context()));
-
         $fs = get_file_storage();
 
         $files = $fs->get_area_files($this->assignment->get_context()->id,
@@ -158,7 +154,8 @@ class assign_submission_onlinetext extends assign_submission_plugin {
             'objectid' => $submission->id,
             'other' => array(
                 'pathnamehashes' => array_keys($files),
-                'content' => trim($text)
+                'content' => trim($data->onlinetext),
+                'format' => $data->onlinetext_editor['format']
             )
         );
         $event = \assignsubmission_onlinetext\event\assessable_uploaded::create($params);
@@ -424,12 +421,9 @@ class assign_submission_onlinetext extends assign_submission_plugin {
         // Format the info for each submission plugin (will be logged).
         $onlinetextsubmission = $this->get_onlinetext_submission($submission->id);
         $onlinetextloginfo = '';
-        $text = format_text($onlinetextsubmission->onlinetext,
-                            $onlinetextsubmission->onlineformat,
-                            array('context'=>$this->assignment->get_context()));
         $onlinetextloginfo .= get_string('numwordsforlog',
                                          'assignsubmission_onlinetext',
-                                         count_words($text));
+                                         count_words($onlinetextsubmission->onlinetext));
 
         return $onlinetextloginfo;
     }
diff --git a/mod/assign/submission/onlinetext/tests/events_test.php b/mod/assign/submission/onlinetext/tests/events_test.php
index 8d40bc385e6..ce2616d6caa 100644
--- a/mod/assign/submission/onlinetext/tests/events_test.php
+++ b/mod/assign/submission/onlinetext/tests/events_test.php
@@ -60,6 +60,7 @@ class assignsubmission_onlinetext_events_testcase extends advanced_testcase {
         $this->assertEquals($context->id, $event->contextid);
         $this->assertEquals($submission->id, $event->objectid);
         $this->assertEquals(array(), $event->other['pathnamehashes']);
+        $this->assertEquals(FORMAT_PLAIN, $event->other['format']);
         $this->assertEquals('Submission text', $event->other['content']);
         $expected = new stdClass();
         $expected->modulename = 'assign';
diff --git a/mod/assign/upgrade.txt b/mod/assign/upgrade.txt
index 44c2f892be6..601d8b56c82 100644
--- a/mod/assign/upgrade.txt
+++ b/mod/assign/upgrade.txt
@@ -1,5 +1,12 @@
 This files describes API changes in the assign code.
 
+=== 2.6.1 ===
+
+* format_text() is no longer used for formating assignment content to be used in events (assign_submission_onlinetext::save()) or
+  the word count (assign_submission_onlinetext::format_for_log()) in mod/assign/submission/onlinetext/locallib.php. format_text()
+  should only be used when displaying information to the screen. It was being used incorrectly before in these areas. Plugins using
+  the event assessable_uploaded() should use file_rewrite_pluginfile_urls() to translate the text back to the desired output.
+
 === 2.6 ===
 * To see submission/grades of inactive users, user should have moodle/course:viewsuspendedusers capability.
 * count_* functions will return only active participants.