should hopefully fix old services showing up on invoices, RT#5451/RT#5514/RT#5564...