LPS-32382 Revert Julio's changes