am 2c23471c: Merge "Revert "More cyrpto failures...""

* commit '2c23471c9051e117d8df31f80488e24e3a524d00':
  Revert "More cyrpto failures..."