This reverts commit 2f7fd418. Reason for revert: broke settings presubmit Change-Id: I3c72ea8949c5a4df858f3dfc2a931786cad4cb83