diff --git a/docs/Changelog.md b/docs/Changelog.md
index 5d77fa4e..a1a8590b 100644
--- a/docs/Changelog.md
+++ b/docs/Changelog.md
@@ -12,6 +12,8 @@
 - vtm-models module [#580](https://github.com/mapsforge/vtm/issues/580)
 - ViewController refactor [#625](https://github.com/mapsforge/vtm/pull/625)
   - `getMapViewCenter`, `setMapViewCenter` with pivotX, pivotY
+- Enable physical fling and fling on rotation / scale
+  - `Parameters.ANIMATOR2`
 - Enable optimal placement of labels or symbols on polygons
   - `Parameters.POLY_LABEL`
 - Enable placement of symbols on polygons
diff --git a/vtm-android-example/AndroidManifest.xml b/vtm-android-example/AndroidManifest.xml
index 5eecc672..45a68312 100644
--- a/vtm-android-example/AndroidManifest.xml
+++ b/vtm-android-example/AndroidManifest.xml
@@ -22,9 +22,6 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-        <activity
-            android:name=".Animator2Activity"
-            android:configChanges="keyboardHidden|orientation|screenSize" />
         <activity
             android:name=".AtlasMarkerOverlayActivity"
             android:configChanges="keyboardHidden|orientation|screenSize" />
diff --git a/vtm-android-example/src/org/oscim/android/test/Animator2Activity.java b/vtm-android-example/src/org/oscim/android/test/Animator2Activity.java
deleted file mode 100644
index ae3d7783..00000000
--- a/vtm-android-example/src/org/oscim/android/test/Animator2Activity.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright 2018 devemux86
- *
- * This program is free software: you can redistribute it and/or modify it under the
- * terms of the GNU Lesser General Public License as published by the Free Software
- * Foundation, either version 3 of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License along with
- * this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.oscim.android.test;
-
-import org.oscim.utils.Parameters;
-
-public class Animator2Activity extends MarkerOverlayActivity {
-
-    public Animator2Activity() {
-        super();
-        Parameters.ANIMATOR2 = true;
-    }
-
-    @Override
-    protected void onDestroy() {
-        super.onDestroy();
-
-        Parameters.ANIMATOR2 = false;
-    }
-}
diff --git a/vtm-android-example/src/org/oscim/android/test/Samples.java b/vtm-android-example/src/org/oscim/android/test/Samples.java
index f19efe53..e6720e48 100644
--- a/vtm-android-example/src/org/oscim/android/test/Samples.java
+++ b/vtm-android-example/src/org/oscim/android/test/Samples.java
@@ -127,7 +127,6 @@ public class Samples extends Activity {
         linearLayout.addView(createButton(VectorLayerActivity.class));
 
         linearLayout.addView(createLabel("User Interaction"));
-        linearLayout.addView(createButton(Animator2Activity.class));
         linearLayout.addView(createButton(MapEventLayer2Activity.class));
         linearLayout.addView(createButton(LayerGroupActivity.class));
 
diff --git a/vtm-playground/src/org/oscim/test/Animator2Test.java b/vtm-playground/src/org/oscim/test/Animator2Test.java
deleted file mode 100644
index 32278084..00000000
--- a/vtm-playground/src/org/oscim/test/Animator2Test.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright 2018 devemux86
- *
- * This program is free software: you can redistribute it and/or modify it under the
- * terms of the GNU Lesser General Public License as published by the Free Software
- * Foundation, either version 3 of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License along with
- * this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.oscim.test;
-
-import org.oscim.gdx.GdxMapApp;
-import org.oscim.utils.Parameters;
-
-public class Animator2Test extends MarkerLayerTest {
-
-    public static void main(String[] args) {
-        Parameters.ANIMATOR2 = true;
-
-        GdxMapApp.init();
-        GdxMapApp.run(new Animator2Test());
-    }
-}
diff --git a/vtm/src/org/oscim/utils/Parameters.java b/vtm/src/org/oscim/utils/Parameters.java
index b95353a5..1c935d26 100644
--- a/vtm/src/org/oscim/utils/Parameters.java
+++ b/vtm/src/org/oscim/utils/Parameters.java
@@ -19,7 +19,7 @@ public final class Parameters {
     /**
      * If true the <code>Animator2</code> will be used instead of default <code>Animator</code>.
      */
-    public static boolean ANIMATOR2 = false;
+    public static boolean ANIMATOR2 = true;
 
     /**
      * Allow custom scale factor for short vertices instead of the calculated one.