Revert "Fix random underflow. am: 448cff811f" am: a93e63f54e
am: d735207323

Change-Id: I6cb608dc2303affcbd940c07d055c7d28d3a4416