diff --git a/CHANGELOG.md b/CHANGELOG.md
index d01c9b376..e91ae2b58 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,9 @@ The links to individual versions below are to copies of the script with the upda
 
 ### v1.10.11
 
+**v1.10.11.1** *(2015-04-24)* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.10.11.1/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.10.11.1/builds/4chan-X-noupdate.crx "Chromium version")]
+- Merge v1.10.10.3: Fix original post form not showing when JS is disabled.
+
 **v1.10.11.0** *(2015-04-24)* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.10.11.0/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.10.11.0/builds/4chan-X-noupdate.crx "Chromium version")]
 - Based on v1.10.10.2.
 - Fix whitespace being stripped from the comment before filtering. This makes it possible to filter whitespace spam.
diff --git a/builds/4chan-X-beta.crx b/builds/4chan-X-beta.crx
index 2f52e6fd3..2b8231c04 100644
Binary files a/builds/4chan-X-beta.crx and b/builds/4chan-X-beta.crx differ
diff --git a/builds/4chan-X-beta.meta.js b/builds/4chan-X-beta.meta.js
index dafa763b7..436e671dc 100644
--- a/builds/4chan-X-beta.meta.js
+++ b/builds/4chan-X-beta.meta.js
@@ -1,6 +1,6 @@
 // ==UserScript==
 // @name         4chan X beta
-// @version      1.10.11.0
+// @version      1.10.11.1
 // @minGMVer     1.14
 // @minFFVer     26
 // @namespace    4chan-X
diff --git a/builds/4chan-X-beta.user.js b/builds/4chan-X-beta.user.js
index a45110120..2044b92ee 100644
--- a/builds/4chan-X-beta.user.js
+++ b/builds/4chan-X-beta.user.js
@@ -1,7 +1,7 @@
 // Generated by CoffeeScript
 // ==UserScript==
 // @name         4chan X beta
-// @version      1.10.11.0
+// @version      1.10.11.1
 // @minGMVer     1.14
 // @minFFVer     26
 // @namespace    4chan-X
@@ -399,7 +399,7 @@
   doc = d.documentElement;
 
   g = {
-    VERSION: '1.10.11.0',
+    VERSION: '1.10.11.1',
     NAMESPACE: '4chan X.',
     boards: {}
   };
@@ -6674,8 +6674,8 @@
       if (g.VIEW === 'archive') {
         return;
       }
-      $.globalEval('document.documentElement.dataset.jsEnabled = true;');
-      noscript = Conf['Force Noscript Captcha'] || !doc.dataset.jsEnabled;
+      $.globalEval('document.documentElement.classList.add("js-enabled");');
+      noscript = Conf['Force Noscript Captcha'] || !$.hasClass(doc, 'js-enabled');
       this.captcha = Captcha[noscript ? 'noscript' : 'v2'];
       $.on(d, '4chanXInitFinished', this.initReady);
       Post.callbacks.push({
@@ -6704,7 +6704,7 @@
       }
       if (Conf['Hide Original Post Form']) {
         $.addClass(doc, 'hide-original-post-form');
-        if (!doc.dataset.jsEnabled) {
+        if (!$.hasClass(doc, 'js-enabled')) {
           return $.onExists(doc, '#postForm noscript', true, $.rm);
         }
       }
@@ -17255,10 +17255,8 @@
 "  /* party hats */\n" +
 "  pointer-events: none;\n" +
 "}\n" +
-"marquee,\n" +
-".postMessage marquee + br,\n" +
-".postMessage marquee + br + br {\n" +
-"  display: none;\n" +
+":root:not(.js-enabled) #postForm {\n" +
+"  display: table;\n" +
 "}\n" +
 "/* Anti-autoplay */\n" +
 "audio.controls-added {\n" +
diff --git a/builds/4chan-X-noupdate.crx b/builds/4chan-X-noupdate.crx
index 555a71f3d..e2a5bfd2a 100644
Binary files a/builds/4chan-X-noupdate.crx and b/builds/4chan-X-noupdate.crx differ
diff --git a/builds/4chan-X-noupdate.user.js b/builds/4chan-X-noupdate.user.js
index e2587d1eb..831d8bd32 100644
--- a/builds/4chan-X-noupdate.user.js
+++ b/builds/4chan-X-noupdate.user.js
@@ -1,7 +1,7 @@
 // Generated by CoffeeScript
 // ==UserScript==
 // @name         4chan X
-// @version      1.10.11.0
+// @version      1.10.11.1
 // @minGMVer     1.14
 // @minFFVer     26
 // @namespace    4chan-X
@@ -398,7 +398,7 @@
   doc = d.documentElement;
 
   g = {
-    VERSION: '1.10.11.0',
+    VERSION: '1.10.11.1',
     NAMESPACE: '4chan X.',
     boards: {}
   };
@@ -6673,8 +6673,8 @@
       if (g.VIEW === 'archive') {
         return;
       }
-      $.globalEval('document.documentElement.dataset.jsEnabled = true;');
-      noscript = Conf['Force Noscript Captcha'] || !doc.dataset.jsEnabled;
+      $.globalEval('document.documentElement.classList.add("js-enabled");');
+      noscript = Conf['Force Noscript Captcha'] || !$.hasClass(doc, 'js-enabled');
       this.captcha = Captcha[noscript ? 'noscript' : 'v2'];
       $.on(d, '4chanXInitFinished', this.initReady);
       Post.callbacks.push({
@@ -6703,7 +6703,7 @@
       }
       if (Conf['Hide Original Post Form']) {
         $.addClass(doc, 'hide-original-post-form');
-        if (!doc.dataset.jsEnabled) {
+        if (!$.hasClass(doc, 'js-enabled')) {
           return $.onExists(doc, '#postForm noscript', true, $.rm);
         }
       }
@@ -17254,10 +17254,8 @@
 "  /* party hats */\n" +
 "  pointer-events: none;\n" +
 "}\n" +
-"marquee,\n" +
-".postMessage marquee + br,\n" +
-".postMessage marquee + br + br {\n" +
-"  display: none;\n" +
+":root:not(.js-enabled) #postForm {\n" +
+"  display: table;\n" +
 "}\n" +
 "/* Anti-autoplay */\n" +
 "audio.controls-added {\n" +
diff --git a/builds/4chan-X.crx b/builds/4chan-X.crx
index da86a1c38..412704a12 100644
Binary files a/builds/4chan-X.crx and b/builds/4chan-X.crx differ
diff --git a/builds/4chan-X.meta.js b/builds/4chan-X.meta.js
index 6fb9d8cfc..384f8bbc0 100644
--- a/builds/4chan-X.meta.js
+++ b/builds/4chan-X.meta.js
@@ -1,6 +1,6 @@
 // ==UserScript==
 // @name         4chan X
-// @version      1.10.11.0
+// @version      1.10.11.1
 // @minGMVer     1.14
 // @minFFVer     26
 // @namespace    4chan-X
diff --git a/builds/4chan-X.user.js b/builds/4chan-X.user.js
index 96d196ca3..b0fe5afb7 100644
--- a/builds/4chan-X.user.js
+++ b/builds/4chan-X.user.js
@@ -1,7 +1,7 @@
 // Generated by CoffeeScript
 // ==UserScript==
 // @name         4chan X
-// @version      1.10.11.0
+// @version      1.10.11.1
 // @minGMVer     1.14
 // @minFFVer     26
 // @namespace    4chan-X
@@ -399,7 +399,7 @@
   doc = d.documentElement;
 
   g = {
-    VERSION: '1.10.11.0',
+    VERSION: '1.10.11.1',
     NAMESPACE: '4chan X.',
     boards: {}
   };
@@ -6674,8 +6674,8 @@
       if (g.VIEW === 'archive') {
         return;
       }
-      $.globalEval('document.documentElement.dataset.jsEnabled = true;');
-      noscript = Conf['Force Noscript Captcha'] || !doc.dataset.jsEnabled;
+      $.globalEval('document.documentElement.classList.add("js-enabled");');
+      noscript = Conf['Force Noscript Captcha'] || !$.hasClass(doc, 'js-enabled');
       this.captcha = Captcha[noscript ? 'noscript' : 'v2'];
       $.on(d, '4chanXInitFinished', this.initReady);
       Post.callbacks.push({
@@ -6704,7 +6704,7 @@
       }
       if (Conf['Hide Original Post Form']) {
         $.addClass(doc, 'hide-original-post-form');
-        if (!doc.dataset.jsEnabled) {
+        if (!$.hasClass(doc, 'js-enabled')) {
           return $.onExists(doc, '#postForm noscript', true, $.rm);
         }
       }
@@ -17255,10 +17255,8 @@
 "  /* party hats */\n" +
 "  pointer-events: none;\n" +
 "}\n" +
-"marquee,\n" +
-".postMessage marquee + br,\n" +
-".postMessage marquee + br + br {\n" +
-"  display: none;\n" +
+":root:not(.js-enabled) #postForm {\n" +
+"  display: table;\n" +
 "}\n" +
 "/* Anti-autoplay */\n" +
 "audio.controls-added {\n" +
diff --git a/builds/4chan-X.zip b/builds/4chan-X.zip
index b61498de6..3890dad90 100644
Binary files a/builds/4chan-X.zip and b/builds/4chan-X.zip differ
diff --git a/builds/updates-beta.xml b/builds/updates-beta.xml
index 394584967..214b53249 100644
--- a/builds/updates-beta.xml
+++ b/builds/updates-beta.xml
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <gupdate xmlns='http://www.google.com/update2/response' protocol='2.0'>
   <app appid='lacclbnghgdicfifcamcmcnilckjamag'>
-    <updatecheck codebase='https://ccd0.github.io/4chan-x/builds/4chan-X-beta.crx' version='1.10.11.0' />
+    <updatecheck codebase='https://ccd0.github.io/4chan-x/builds/4chan-X-beta.crx' version='1.10.11.1' />
   </app>
 </gupdate>
 
diff --git a/builds/updates.xml b/builds/updates.xml
index d952a2126..06a246d19 100644
--- a/builds/updates.xml
+++ b/builds/updates.xml
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <gupdate xmlns='http://www.google.com/update2/response' protocol='2.0'>
   <app appid='lacclbnghgdicfifcamcmcnilckjamag'>
-    <updatecheck codebase='https://ccd0.github.io/4chan-x/builds/4chan-X.crx' version='1.10.11.0' />
+    <updatecheck codebase='https://ccd0.github.io/4chan-x/builds/4chan-X.crx' version='1.10.11.1' />
   </app>
 </gupdate>
 
diff --git a/package.json b/package.json
index 8c8dc1cd3..4b81025e2 100755
--- a/package.json
+++ b/package.json
@@ -3,8 +3,8 @@
   "description": "Cross-browser userscript for maximum lurking on 4chan.",
   "meta": {
     "name": "4chan X",
-    "version": "1.10.11.0",
-    "date": "2015-04-24T08:11:43.462Z",
+    "version": "1.10.11.1",
+    "date": "2015-04-24T14:48:43.242Z",
     "repo": "https://github.com/ccd0/4chan-x/",
     "page": "https://github.com/ccd0/4chan-x",
     "downloads": "https://ccd0.github.io/4chan-x/builds/",