am fddae069: am fc4fb0fd: Merge "Revert "Fallback to quick in case of soft verification errors""

* commit 'fddae069694558e25610718d1ad74ff54f88c944':
  Revert "Fallback to quick in case of soft verification errors"