this reverts

    commit 610f5965
    fix "cppcheck:stlIfStrFind"

and

    commit 5c1bb338
    cppcheck:stlIfStrFind

which are deficient in one way or another, the original logic, while
inefficient, is still most accurate

Change-Id: I4907d2569c9c2976533f8ac9f4b8b45eb1807b72