Fix regression: don't freak out if a subscription payment arrive out-of-order

Change-Id: I2265cb18f9157ecf19dbc9926cbf97e4d7317ac4