[BUGFIX/REVERT] Revert 4bd962b5 and use unique identifier to enable both, multiple RTEs in one record and multiple RTEs because of IRRE