Remove confusing function; add TODO and explanation for (nonfatal) error...

... message in integration test.