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

Change-Id: I481935004d150b1191f3b5ca3d98559ca79fb55d