diff --git a/src/components/form-draft/status.vue b/src/components/form-draft/status.vue
index 407ef814b..1e207c3ed 100644
--- a/src/components/form-draft/status.vue
+++ b/src/components/form-draft/status.vue
@@ -85,12 +85,10 @@ import FormDraftChecklist from './checklist.vue';
 import FormDraftPublish from './publish.vue';
 import FormNew from '../form/new.vue';
 import FormVersionStandardButtons from '../form-version/standard-buttons.vue';
-// Import PageSection before SummaryItem (in FormVersionSummaryItem) in order to
-// have the same import order as other components: see
-// https://github.com/vuejs/vue-cli/issues/3771
 import PageSection from '../page/section.vue';
 import FormVersionSummaryItem from '../form-version/summary-item.vue';
 import Loading from '../loading.vue';
+
 import Option from '../../util/option';
 import modal from '../../mixins/modal';
 import routes from '../../mixins/routes';
diff --git a/src/components/form-draft/testing.vue b/src/components/form-draft/testing.vue
index 01d6f4940..6642433ca 100644
--- a/src/components/form-draft/testing.vue
+++ b/src/components/form-draft/testing.vue
@@ -49,8 +49,6 @@ except according to the terms contained in the LICENSE file.
 </template>
 
 <script>
-// Import PageSection before FloatRow in order to have the same import order as
-// FormSubmissions: see https://github.com/vuejs/vue-cli/issues/3771
 import PageSection from '../page/section.vue';
 import FloatRow from '../float-row.vue';
 import CollectQr from '../collect-qr.vue';
diff --git a/vue.config.js b/vue.config.js
index cb941e70e..ee925ee2b 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -10,6 +10,9 @@ including this file, may be copied, modified, propagated, or distributed
 except according to the terms contained in the LICENSE file.
 */
 module.exports = {
+  css: {
+    extract: { ignoreOrder: true }
+  },
   chainWebpack: (config) => {
     config.module
       .rule('json5')