LPS-33173 revert changes to keep tests working