LPS-32349 Revert for now