Revert "[DO NOT MERGE] Handle config override via settings correctly"
am: 69a015931e

Change-Id: I1e1dd514df630cd9c35f6af59108dfbe31de6a20