Revert "LPS-44812 use a check more consistent with the backend"