LPS-38165 Rollback to keep build green