LPS-40384 Revert bad backport