This reverts commit 33d1d0ae. BUG: 117518489 Test: Local build, connects (cherry picked from commit dd35893cfe3ef9a377f4697ad1412f7509c0fd1c)