Go back to the settings of the original commit.

Change-Id: I811061f47c172663750e7f3394f4c874eba18106