LPS-36620

Hey @rotty3000 this is just reverting one commit you introduced as part or LPS-36171 which caused several regressions (like the one @holatuwol was trying to fix). We want to keep this change minimal since it should be backported to 6.1.x today and the whole features is very unstable right now in 6.2.x.