This reverts commit 4c0fe024. Bug: 67234670 Test: m ahat-test Test: Manually inspect some sample paths. Change-Id: I66b32c3a7d19d9da7d56ab162313932411c9bbff