Revert "Fallback to CP2 when we don't get anything from yenta"

This reverts commit b064f94bfd0b872eefc4c581902df5bc43b29970.

Test: see I8da3a4b292448d547206c99a516683b0c98d215a
Bug: 30436991

Change-Id: I9d878599435373c49588e96857330afc667272ba
1 file changed