Unfortunately still seeing failures due to localhost uses. This reverts commit a04ece31. Change-Id: I9572e53bc1ef405060359f0eeaa1f726299349b3