Revert "Fix random underflow. am: 448cff811f" am: a93e63f54e am: b4f9323ac4
am: 5bf5129d86

Change-Id: I5b21e43fb19b81782c7322e945f39e424c6f3b7b