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

Change-Id: If4de9184c81e9c3b77426f43e81172656f0b25a1