LPS-34804 revert changes to pass tests - will resend tomorrow with tests fixed