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

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