LPS-34846 revert changes (breaking tests)