diff --git a/Rakefile b/Rakefile
index e2a82a7f..83ed796d 100644
--- a/Rakefile
+++ b/Rakefile
@@ -181,8 +181,6 @@ end
 
 desc 'Precompile assets'
 task :precompile do
-  require 'gollum'
-  require 'gollum-lib'
   require './lib/gollum/views/helpers.rb'
   require './lib/gollum/assets.rb'
   require 'sprockets'
diff --git a/lib/gollum/public/gollum/javascript/gollum.js.erb b/lib/gollum/public/gollum/javascript/gollum.js.erb
index 72c17f57..2cfd12cf 100755
--- a/lib/gollum/public/gollum/javascript/gollum.js.erb
+++ b/lib/gollum/public/gollum/javascript/gollum.js.erb
@@ -82,12 +82,6 @@ function abspath(path, name){
   return [newPath, newName];
 }
 
-var gollumFormats = $.parseJSON('<%= format_extensions %>');
-function formatToExt(format) {
-  // 'markdown' -> .md, 'asciidoc' -> .asciidoc
-  return gollumFormats[format];
-}
-
 function setTextDirection () {
   $('.markdown-body p, .markdown-body span, .markdown-body pre, .markdown-body table').attr('dir','auto');
 }
@@ -444,7 +438,8 @@ $(document).ready(function() {
       $(this).attr('disabled', true);
 
       var formData = new FormData($('#gollum-editor-form').get(0));
-      var newPath  = cleanPath(prefixBaseUrl(pagePath() + '/' + pageName() + formatToExt($('#wiki_format')[0].value)));
+      var newExt   = '.' + $('#wiki_format option:selected').attr('data-ext');
+      var newPath  = cleanPath(prefixBaseUrl(pagePath() + '/' + pageName() + newExt));
       var endpoint = $('#gollum-editor-form').attr("action");
 
       $.ajax({
diff --git a/lib/gollum/templates/editor.mustache b/lib/gollum/templates/editor.mustache
index 57e021a9..57286cff 100644
--- a/lib/gollum/templates/editor.mustache
+++ b/lib/gollum/templates/editor.mustache
@@ -59,14 +59,14 @@
       <select id="wiki_format" name="format" class="form-select">
       {{#formats}}
       {{#enabled}}
-      <option {{#selected}}selected="selected" {{/selected}}value="{{id}}">
+      <option {{#selected}}selected="selected" {{/selected}}value="{{id}}" data-ext="{{ext}}">
         {{name}}
         </option>
       {{/enabled}}
       {{/formats}}
       {{#formats}}
       {{^enabled}}
-      <option class="disabled" {{#selected}}selected="selected" {{/selected}}value="{{id}}">
+      <option class="disabled" {{#selected}}selected="selected" {{/selected}}value="{{id}}" data-ext="{{ext}}">
         {{name}}
         </option>
       {{/enabled}}
diff --git a/lib/gollum/views/editable.rb b/lib/gollum/views/editable.rb
index 45dd08ad..4ca9c41f 100644
--- a/lib/gollum/views/editable.rb
+++ b/lib/gollum/views/editable.rb
@@ -9,6 +9,7 @@ module Precious
         { :name     => val[:name],
           :id       => key.to_s,
           :enabled  => val.fetch(:enabled, true),
+          :ext      => Gollum::Page.format_to_ext(key),
           :selected => selected == key }
       end.sort do |a, b|
         a[:name].downcase <=> b[:name].downcase
diff --git a/lib/gollum/views/helpers.rb b/lib/gollum/views/helpers.rb
index 676bb4ed..29c44ba4 100644
--- a/lib/gollum/views/helpers.rb
+++ b/lib/gollum/views/helpers.rb
@@ -51,9 +51,6 @@ module Precious
         define_method :routes_to_json do
           @@route_methods.to_json
         end
-        define_method :format_extensions do
-          Hash[Gollum::Markup.formats.to_a.map{|fmt| [fmt[0], ".#{Gollum::Page.format_to_ext(fmt[0])}"]}].to_json
-        end
       end
 
       def page_route(page)