LPS-40794 Revert LPS-40662 due to regressions (priority 5)