Revert "Fix stack-walking race"
am: e0c6d43927

Change-Id: I606aad759907f43a2f14efde1c267b7a4e039adc