LPS-41503 Revert