For the records: The old implementation breaks the laws, so that's justification enough.