LPS-34660 revert changes to fix tests