diff --git a/plugins/PerObjectSettingsTool/PerObjectSettingsModel.py b/plugins/PerObjectSettingsTool/PerObjectSettingsModel.py
index 7f7cef049b..cbe22d129e 100644
--- a/plugins/PerObjectSettingsTool/PerObjectSettingsModel.py
+++ b/plugins/PerObjectSettingsTool/PerObjectSettingsModel.py
@@ -7,8 +7,8 @@ from UM.Application import Application
 from UM.Qt.ListModel import ListModel
 from UM.Scene.Iterator.BreadthFirstIterator import BreadthFirstIterator
 from UM.Scene.SceneNode import SceneNode
-from UM.Settings.SettingOverrideDecorator import SettingOverrideDecorator
-from UM.Settings.ProfileOverrideDecorator import ProfileOverrideDecorator
+#from UM.Settings.SettingOverrideDecorator import SettingOverrideDecorator
+#from UM.Settings.ProfileOverrideDecorator import ProfileOverrideDecorator
 
 from . import SettingOverrideModel
 
@@ -35,7 +35,7 @@ class PerObjectSettingsModel(ListModel):
         self.setProperty(self.find("id", object_id), "profile", profile_name)
 
         profile = None
-        if profile_name != "global":
+        '''if profile_name != "global":
             profile = Application.getInstance().getMachineManager().findProfile(profile_name)
 
         node = self._scene.findObject(object_id)
@@ -45,7 +45,7 @@ class PerObjectSettingsModel(ListModel):
             node.callDecoration("setProfile", profile)
         else:
             if node.getDecorator(ProfileOverrideDecorator):
-                node.removeDecorator(ProfileOverrideDecorator)
+                node.removeDecorator(ProfileOverrideDecorator)'''
 
     @pyqtSlot("quint64", str)
     def addSettingOverride(self, object_id, key):
@@ -54,8 +54,8 @@ class PerObjectSettingsModel(ListModel):
             return
 
         node = self._scene.findObject(object_id)
-        if not node.getDecorator(SettingOverrideDecorator):
-            node.addDecorator(SettingOverrideDecorator())
+        #if not node.getDecorator(SettingOverrideDecorator):
+        #    node.addDecorator(SettingOverrideDecorator())
 
         node.callDecoration("addSetting", key)
 
@@ -64,8 +64,8 @@ class PerObjectSettingsModel(ListModel):
         node = self._scene.findObject(object_id)
         node.callDecoration("removeSetting", key)
 
-        if len(node.callDecoration("getAllSettings")) == 0:
-            node.removeDecorator(SettingOverrideDecorator)
+        #if len(node.callDecoration("getAllSettings")) == 0:
+        #    node.removeDecorator(SettingOverrideDecorator)
 
     def _updateModel(self):
         self.clear()
diff --git a/plugins/PerObjectSettingsTool/SettingOverrideModel.py b/plugins/PerObjectSettingsTool/SettingOverrideModel.py
index 860650015c..d4bebfdfee 100644
--- a/plugins/PerObjectSettingsTool/SettingOverrideModel.py
+++ b/plugins/PerObjectSettingsTool/SettingOverrideModel.py
@@ -5,7 +5,7 @@ from PyQt5.QtCore import Qt, pyqtSlot, QUrl
 
 from UM.Application import Application
 from UM.Qt.ListModel import ListModel
-from UM.Settings.SettingOverrideDecorator import SettingOverrideDecorator
+#from UM.Settings.SettingOverrideDecorator import SettingOverrideDecorator
 
 class SettingOverrideModel(ListModel):
     KeyRole = Qt.UserRole + 1
@@ -29,9 +29,9 @@ class SettingOverrideModel(ListModel):
         self._node.decoratorsChanged.connect(self._onDecoratorsChanged)
         self._onDecoratorsChanged(None)
 
-        self._activeProfile = Application.getInstance().getMachineManager().getWorkingProfile() #To be able to get notified when a setting changes.
-        self._activeProfile.settingValueChanged.connect(self._onProfileSettingValueChanged)
-        Application.getInstance().getMachineManager().activeProfileChanged.connect(self._onProfileChanged)
+        #self._activeProfile = Application.getInstance().getMachineManager().getWorkingProfile() #To be able to get notified when a setting changes.
+        #self._activeProfile.settingValueChanged.connect(self._onProfileSettingValueChanged)
+        #Application.getInstance().getMachineManager().activeProfileChanged.connect(self._onProfileChanged)
 
         self.addRoleName(self.KeyRole, "key")
         self.addRoleName(self.LabelRole, "label")
@@ -53,7 +53,8 @@ class SettingOverrideModel(ListModel):
         self._decorator.setSettingValue(key, value)
 
     def _onDecoratorsChanged(self, node):
-        if not self._node.getDecorator(SettingOverrideDecorator):
+        return
+        '''if not self._node.getDecorator(SettingOverrideDecorator):
             self.clear()
             return
 
@@ -61,7 +62,7 @@ class SettingOverrideModel(ListModel):
         self._decorator.settingAdded.connect(self._onSettingsChanged)
         self._decorator.settingRemoved.connect(self._onSettingsChanged)
         self._decorator.settingValueChanged.connect(self._onSettingValueChanged)
-        self._onSettingsChanged()
+        self._onSettingsChanged()'''
 
     def _createOptionsModel(self, options):
         if not options:
diff --git a/plugins/PerObjectSettingsTool/__init__.py b/plugins/PerObjectSettingsTool/__init__.py
index 0d49b2c892..d5d249b430 100644
--- a/plugins/PerObjectSettingsTool/__init__.py
+++ b/plugins/PerObjectSettingsTool/__init__.py
@@ -13,7 +13,7 @@ def getMetaData():
             "author": "Ultimaker",
             "version": "1.0",
             "description": i18n_catalog.i18nc("@info:whatsthis", "Provides the Per Object Settings."),
-            "api": 2
+            "api": 3
         },
         "tool": {
             "name": i18n_catalog.i18nc("@label", "Per Object Settings"),