diff --git a/templates/display/import/format_option.twig b/templates/display/import/format_option.twig
deleted file mode 100644
index c48ccc15d0..0000000000
--- a/templates/display/import/format_option.twig
+++ /dev/null
@@ -1,22 +0,0 @@
-<div class="importoptions">
-    <h3>{% trans 'Format:' %}</h3>
-    {{ Plugins_getChoice('Import', 'format', import_list) }}
-    <div id="import_notification"></div>
-</div>
-
-<div class="importoptions" id="format_specific_opts">
-    <h3>{% trans 'Format-specific options:' %}</h3>
-    <p class="no_js_msg" id="scroll_to_options_msg">
-        {% trans 'Scroll down to fill in the options for the selected format and ignore the options for other formats.' %}
-    </p>
-    {{ Plugins_getOptions('Import', import_list) }}
-</div>
-<div class="clearfloat"></div>
-
-{# Japanese encoding setting #}
-{% if can_convert_kanji %}
-    <div class="importoptions" id="kanji_encoding">
-        <h3>{% trans 'Encoding Conversion:' %}</h3>
-        {% include 'encoding/kanji_encoding_form.twig' %}
-    </div>
-{% endif %}
diff --git a/templates/display/import/import.twig b/templates/display/import/import.twig
index 63a728ed22..b073717d14 100644
--- a/templates/display/import/import.twig
+++ b/templates/display/import/import.twig
@@ -58,10 +58,28 @@
 
         {% include 'display/import/other_option.twig' only %}
 
-        {% include 'display/import/format_option.twig' with {
-            'import_list': import_list,
-            'can_convert_kanji': can_convert_kanji
-        } only %}
+        <div class="importoptions">
+            <h3>{% trans 'Format:' %}</h3>
+            {{ Plugins_getChoice('Import', 'format', import_list) }}
+            <div id="import_notification"></div>
+        </div>
+
+        <div class="importoptions" id="format_specific_opts">
+            <h3>{% trans 'Format-specific options:' %}</h3>
+            <p class="no_js_msg" id="scroll_to_options_msg">
+                {% trans 'Scroll down to fill in the options for the selected format and ignore the options for other formats.' %}
+            </p>
+            {{ Plugins_getOptions('Import', import_list) }}
+        </div>
+        <div class="clearfloat"></div>
+
+        {# Japanese encoding setting #}
+        {% if can_convert_kanji %}
+            <div class="importoptions" id="kanji_encoding">
+                <h3>{% trans 'Encoding Conversion:' %}</h3>
+                {% include 'encoding/kanji_encoding_form.twig' %}
+            </div>
+        {% endif %}
 
         <div class="importoptions" id="submit">
             <input type="submit" value="{% trans 'Go' %}" id="buttonGo" />