am aca37776: handle removal of self added configurations

* commit 'aca3777661f2e29d5cca60a8a11dea2878eae6e5':
  handle removal of self added configurations