Court of Justice of the European Union ruled last October that current scheme is incompatible with EU law