Remove confusing function; add TODO and explanation for (nonfatal) error message in integration test.
Merge pull request #2391 from lavalamp/fix3

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