LPS-35186 revert changes to keep tests passing