LPS-32500 revert refactorization. keep only real changes. The refactorization should be sent as a separate commit