Revert removing macro underflow prevention.