Revert some of change 109925 to fix connectivity

bug:4476009
Change-Id: I93c492eebe24d9744b8ef79378c73301d167f5a3
1 file changed