This reverts commit 9b5515eb. Breaks some gtests. Change-Id: Ic9c9061b05219f19d5c7713ce0239e60c9d6e287