Ok, I will revert this and re-pull. I agree on that we should solve this in another way (I had already commented that), in another MR.