diff --git a/build.allScripts/build.xml b/build.allScripts/build.xml
deleted file mode 100644
index e3395046b..000000000
--- a/build.allScripts/build.xml
+++ /dev/null
@@ -1,193 +0,0 @@
-<project name="mps-extensions.allScripts" default="build">
-  <!-- Generated by MPS -->
-  <property name="build.dir" location="build" />
-  <property name="build.tmp" location="${build.dir}/tmp/mps-extensions.allScripts" />
-  <property name="build.layout" location="${build.dir}/artifacts/mps-extensions.allScripts" />
-  <property name="mps.home" location="${basedir}/../../../../../../../Applications/MPS 2017.3.app/Contents" />
-  <property name="extensions.code" location="${basedir}/../code" />
-  <property name="artifacts.mps" location="${mps.home}" />
-  <property name="artifacts.mpsBootstrapCore" location="${mps.home}" />
-  <property name="artifacts.IDEA" location="${mps.home}" />
-  <property file="${artifacts.mps}/build.properties" prefix="import.mps" />
-  <property name="mps.build.number" value="${import.mps.mps.build.number}" />
-  <property name="mps.date" value="${import.mps.mps.date}" />
-  <property name="mps.build.vcs.number" value="${import.mps.mps.build.vcs.number}" />
-  <property name="mps.teamcity.buildConfName" value="${import.mps.mps.teamcity.buildConfName}" />
-  <property name="mps.idea.platform.build.number" value="${import.mps.mps.idea.platform.build.number}" />
-  <property name="mps.mps.build.counter" value="${import.mps.mps.mps.build.counter}" />
-  <property name="mpsBootstrapCore.version" value="${import.mps.mpsBootstrapCore.version}" />
-  <property name="environment" value="env" />
-  <property name="env.JAVA_HOME" value="${java.home}/.." />
-  <property name="jdk.home" value="${env.JAVA_HOME}" />
-  
-  <path id="path.mps.ant.path">
-    <pathelement location="${artifacts.mps}/lib/ant/lib/ant-mps.jar" />
-    <pathelement location="${artifacts.IDEA}/lib/jdom.jar" />
-    <pathelement location="${artifacts.IDEA}/lib/log4j.jar" />
-  </path>
-  
-  <target name="assemble" depends="classes, declare-mps-tasks">
-    <mkdir dir="${build.layout}" />
-    <mkdir dir="${build.tmp}/default/de.slisson.mps.all.build.jar" />
-    <mkdir dir="${build.tmp}/default/de.slisson.mps.all.build.jar/META-INF" />
-    <echoxml file="${build.tmp}/default/de.slisson.mps.all.build.jar/META-INF/module.xml">
-      <module namespace="de.slisson.mps.all.build" type="solution" uuid="f1fb7b1c-ce0d-423c-9369-4a661d600029">
-        <dependencies />
-        <classpath>
-          <entry path="." />
-        </classpath>
-        <sources jar="de.slisson.mps.all.build-src.jar" descriptor="de.slisson.mps.all.build.msd" />
-      </module>
-    </echoxml>
-    <jar destfile="${build.layout}/de.slisson.mps.all.build.jar" duplicate="preserve">
-      <fileset dir="${build.tmp}/java/out/de.slisson.mps.all.build" />
-      <fileset dir="${extensions.code}/mps-build/solutions/de.slisson.mps.all.build" includes="icons/**, resources/**" />
-      <fileset dir="${extensions.code}/mps-build/solutions/de.slisson.mps.all.build/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
-      <fileset dir="${build.tmp}/default/de.slisson.mps.all.build.jar" />
-    </jar>
-    <copyModels todir="${build.tmp}/customProcessors/copyModels/mps-build-solutions-de.slisson.mps.all.build-models">
-      <fileset dir="${extensions.code}/mps-build/solutions/de.slisson.mps.all.build/models" includes="**/*.mps, **/*.metadata, **/*.history, **/*.mpsr, **/.model" />
-    </copyModels>
-    <jar destfile="${build.layout}/de.slisson.mps.all.build-src.jar" duplicate="preserve">
-      <fileset dir="${extensions.code}/mps-build/solutions/de.slisson.mps.all.build/source_gen">
-        <exclude name="**/trace.info" />
-        <exclude name="**/exports" />
-        <exclude name="**/checkpoints" />
-        <exclude name="**/*.mps" />
-      </fileset>
-      <zipfileset file="${extensions.code}/mps-build/solutions/de.slisson.mps.all.build/de.slisson.mps.all.build.msd" prefix="module" />
-      <zipfileset dir="${build.tmp}/customProcessors/copyModels/mps-build-solutions-de.slisson.mps.all.build-models" prefix="module/models" />
-    </jar>
-    <echo file="${build.layout}/build.properties">mps.build.number=${mps.build.number}${line.separator}mps.date=${mps.date}${line.separator}mps.build.vcs.number=${mps.build.vcs.number}${line.separator}mps.teamcity.buildConfName=${mps.teamcity.buildConfName}${line.separator}mps.idea.platform.build.number=${mps.idea.platform.build.number}${line.separator}mps.mps.build.counter=${mps.mps.build.counter}${line.separator}mpsBootstrapCore.version=${mpsBootstrapCore.version}</echo>
-  </target>
-  
-  <target name="buildDependents" />
-  
-  <target name="fetchDependencies" />
-  
-  <target name="build" depends="assemble" />
-  
-  <target name="clean">
-    <delete dir="${build.tmp}" />
-    <delete dir="${build.layout}" />
-  </target>
-  
-  <target name="compileJava" depends="java.compile.de.slisson.mps.all.build" />
-  
-  <target name="processResources" />
-  
-  <target name="classes" depends="compileJava, processResources" />
-  
-  <target name="test" depends="classes" />
-  
-  <target name="check" depends="test" />
-  
-  <target name="generate" depends="declare-mps-tasks, fetchDependencies">
-    <echo message="generating" />
-    <generate strictMode="true" parallelMode="true" parallelThreads="16" useInplaceTransform="true" hideWarnings="false" createStaticRefs="false" fork="true" targetJavaVersion="1.8">
-      <library file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.blTypes.jar" />
-      <library file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.classifiers.jar" />
-      <library file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.closures.jar" />
-      <library file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.collections.jar" />
-      <library file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.extensionMethods.jar" />
-      <library file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
-      <library file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.javadoc.jar" />
-      <library file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jdk7.jar" />
-      <library file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.regexp.jar" />
-      <library file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.regexp.runtime.jar" />
-      <library file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.scopes.jar" />
-      <library file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.tuples.jar" />
-      <library file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguageInternal.jar" />
-      <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.baseLanguage.lightweightdsl.jar" />
-      <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.actions.jar" />
-      <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.behavior.jar" />
-      <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.checkedName.jar" />
-      <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.constraints.jar" />
-      <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
-      <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.dataFlow.jar" />
-      <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.editor.jar" />
-      <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.extension.jar" />
-      <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.findUsages.jar" />
-      <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.generator.generationContext.jar" />
-      <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.generator.jar" />
-      <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.intentions.jar" />
-      <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.migration.jar" />
-      <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.migration.runtime.jar" />
-      <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.pattern.jar" />
-      <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.plugin.jar" />
-      <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.project.jar" />
-      <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.quotation.jar" />
-      <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.refactoring.jar" />
-      <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.resources.jar" />
-      <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.scopes.jar" />
-      <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.scopes.runtime.jar" />
-      <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.script.jar" />
-      <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.sharedConcepts.jar" />
-      <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.smodel.jar" />
-      <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.structure.jar" />
-      <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.textGen.jar" />
-      <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.traceable.jar" />
-      <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.typesystem.jar" />
-      <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.refactoring.participant.jar" />
-      <library file="${artifacts.mps}/languages/make/jetbrains.mps.make.reduced.jar" />
-      <library file="${artifacts.mps}/languages/make/jetbrains.mps.tool.gentest.jar" />
-      <library file="${artifacts.mps}/languages/text/jetbrains.mps.lang.text.jar" />
-      <library file="${artifacts.mps}/languages/xml/jetbrains.mps.core.xml.jar" />
-      <library file="${artifacts.mps}/lib/mps-behavior-api.jar" />
-      <library file="${artifacts.mps}/lib/mps-closures.jar" />
-      <library file="${artifacts.mps}/lib/mps-collections.jar" />
-      <library file="${artifacts.mps}/lib/mps-core.jar" />
-      <library file="${artifacts.mps}/lib/mps-editor.jar" />
-      <library file="${artifacts.mps}/lib/mps-environment.jar" />
-      <library file="${artifacts.mps}/lib/mps-openapi.jar" />
-      <library file="${artifacts.mps}/lib/mps-platform.jar" />
-      <library file="${artifacts.mps}/lib/mps-stubs.jar" />
-      <library file="${artifacts.mps}/lib/mps-test.jar" />
-      <library file="${artifacts.mps}/lib/mps-tool.jar" />
-      <library file="${artifacts.mps}/lib/mps-tuples.jar" />
-      <library file="${artifacts.mps}/plugins/mps-build/languages/build/jetbrains.mps.build.jar" />
-      <library file="${artifacts.mps}/plugins/mps-build/languages/build/jetbrains.mps.build.mps.jar" />
-      <library file="${artifacts.mps}/plugins/mps-build/languages/build/jetbrains.mps.build.mps.tests.jar" />
-      <library file="${artifacts.mps}/plugins/mps-build/languages/build/jetbrains.mps.build.workflow.jar" />
-      <library file="${artifacts.mps}/plugins/mps-build/languages/build/jetbrains.mps.build.workflow.preset.jar" />
-      <library file="${artifacts.mps}/plugins/mps-build/languages/build/jetbrains.mps.ide.build.jar" />
-      <chunk>
-        <module file="${extensions.code}/mps-build/solutions/de.slisson.mps.all.build/de.slisson.mps.all.build.msd" />
-      </chunk>
-      <jvmargs>
-        <arg value="-Xmx2024m" />
-        <arg value="-XX:MaxPermSize=1000m" />
-        <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
-      </jvmargs>
-      <macro name="mps.home" path="${mps.home}" />
-      <macro name="extensions.code" path="${extensions.code}" />
-    </generate>
-  </target>
-  
-  <target name="declare-mps-tasks">
-    <taskdef resource="jetbrains/mps/build/ant/antlib.xml" classpathref="path.mps.ant.path" />
-  </target>
-  
-  <target name="makeDependents" />
-  
-  <target name="java.compile.de.slisson.mps.all.build">
-    <mkdir dir="${extensions.code}/mps-build/solutions/de.slisson.mps.all.build/source_gen" />
-    <mkdir dir="${build.tmp}/java/out/de.slisson.mps.all.build" />
-    <javac destdir="${build.tmp}/java/out/de.slisson.mps.all.build" fork="false" encoding="utf8" includeantruntime="false" debug="true" source="1.8" target="1.8">
-      <compilerarg value="-Xlint:none" />
-      <src>
-        <path location="${extensions.code}/mps-build/solutions/de.slisson.mps.all.build/source_gen" />
-      </src>
-      <classpath>
-        <fileset file="${artifacts.mps}/plugins/mps-build/languages/build/jetbrains.mps.build.workflow.preset.jar" />
-      </classpath>
-    </javac>
-    <copy todir="${build.tmp}/java/out/de.slisson.mps.all.build">
-      <fileset dir="${extensions.code}/mps-build/solutions/de.slisson.mps.all.build/source_gen" excludes="**/*.java" />
-    </copy>
-  </target>
-  
-  <target name="cleanSources">
-    <delete dir="${extensions.code}/mps-build/solutions/de.slisson.mps.all.build/source_gen" />
-  </target>
-</project>
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 2cf39533a..88c2e5985 100644
--- a/build.gradle
+++ b/build.gradle
@@ -208,10 +208,11 @@ ext.extensions_home = '-Dextensions.home=' + rootDir
 
 // ___________________ utilities ___________________
 File scriptFile(String relativePath) {
-    new File("$rootDir/build/patched/$relativePath")
+    new File("$rootDir/build/generated/$relativePath")
 }
 
-def defaultScriptArgs = [mps_home, build_dir, artifacts_dir, ext.buildDate, ext.pluginVersion]
+def defaultScriptArgs = [mps_home, build_dir, artifacts_dir, ext.buildDate, ext.pluginVersion,
+                         '-Dbuild.jna.library.path=' + new File(mpsHomeDir, 'lib/jna/' + System.getProperty('os.arch'))]
 
 afterEvaluate {
     project.ext["itemis.mps.gradle.ant.defaultJavaExecutable"] = tasks.getByName('downloadJbr').javaExecutable
@@ -251,30 +252,11 @@ task resolved_diagram_dependencies(type: Copy) {
     }
 }
 
-def build_allScripts_unpatched = tasks.register('build_allScripts_unpatched', BuildLanguages) {
+tasks.register('build_allScripts', BuildLanguages) {
     dependsOn 'downloadJbr', resolveMps, copyModelApi, resolved_diagram_dependencies
     script "$rootDir/scripts/build.xml"
 }
 
-// Patch JNA path in generated build scripts until https://github.com/JetBrains/MPS/pull/71 is fixed
-def patch_allScripts = tasks.register('patch_allScripts', Copy) {
-    dependsOn build_allScripts_unpatched
-    from 'build/generated'
-    into 'build/patched'
-
-    def isAarch64 = System.getProperty('os.arch') == 'aarch64'
-    def jnaArch = isAarch64 ? 'aarch64' : 'amd64'
-
-    filter {
-        it.replace('"-Djna.boot.library.path=${artifacts.mps}/lib/jna"',
-                   '"-Djna.boot.library.path=${artifacts.mps}/lib/jna/' + jnaArch + '"')
-    }
-}
-
-task build_allScripts {
-    dependsOn patch_allScripts
-}
-
 task copyChangelog(type: Copy) {
     from "$rootDir/code/solutions/de.itemis.mps.extensions.changelog/source_gen/de/itemis/mps/extensions/changelog"
     into "$rootDir"