Wasn't the financial incentive the reason for this in the first place? If that's the case then just remove civil forfeiture...