diff --git a/_extensions/odoo/layout.html b/_extensions/odoo/layout.html
index 4c80ed1a3..6eba82ada 100644
--- a/_extensions/odoo/layout.html
+++ b/_extensions/odoo/layout.html
@@ -1,11 +1,11 @@
 {% extends "basic/layout.html" %}
-{%- block scripts %}
- {{ super() }}
-<script type="text/javascript" src="{{ pathto('_static/jquery.min.js', 1) }}"></script>
-<script type="text/javascript" src="{{ pathto('_static/bootstrap.js', 1) }}"></script>
-<script type="text/javascript" src="{{ pathto('_static/doc.js', 1) }}"></script>
-<script type="text/javascript" src="{{ pathto('_static/jquery.noconflict.js', 1) }}"></script>
-{%- endblock %}
+
+{% set script_files = script_files + [
+'_static/jquery.min.js',
+'_static/bootstrap.js',
+'_static/doc.js',
+'_static/jquery.noconflict.js',
+] %}
 
 {% set classes = [] %}
 {% if pagename == master_doc %}
diff --git a/_extensions/odoo/translator.py b/_extensions/odoo/translator.py
index fb52d053a..769496f8a 100644
--- a/_extensions/odoo/translator.py
+++ b/_extensions/odoo/translator.py
@@ -5,7 +5,7 @@ import re
 import urllib
 
 from docutils import nodes
-from sphinx import addnodes, util, builders
+from sphinx import addnodes, util
 from sphinx.locale import admonitionlabels
 
 from . import pycompat
@@ -45,11 +45,6 @@ class BootstrapTranslator(nodes.NodeVisitor, object):
     ]
 
     def __init__(self, builder, document):
-        # order of parameter swapped between Sphinx 1.x and 2.x, check if
-        # we're running 1.x and swap back
-        if not isinstance(builder, builders.Builder):
-            builder, document = document, builder
-
         super(BootstrapTranslator, self).__init__(document)
         self.builder = builder
         self.body = []