This MR reverts all changes related to DIFE-184 so that I can focus on it properly in a later moment.