Revert "Addressing comments for http://ag/7700679."

This reverts commit a229333986f95e48347fa8b653d7e1776019f84a.

Reason for revert: This change has been implicated in 4-way deadlocks as seen in b/134244752.

Bug: 134244752
Change-Id: I5fbb3443a39a21fc9d96442726cd10d20e8d61cd
3 files changed