Apply again the reverted [commit](https://github.com/CERNDocumentServer/cds-rdm/commit/eed37d5257ec6c4c1406b3eac97e43c159aa7654) when the invenio-app-rdm [commit](https://github.com/inveniosoftware/invenio-app-rdm/commit/5237260a2d48603473d4e4e8412a3ac1822faf74) is released. Also, remove the changes from this [commit](https://github.com/CERNDocumentServer/cds-rdm/commit/c060d56021326f274712300676b36d040c427c2c)
