am b0b52f68: am 9d4d13f3: Merge "Revert "Quick: Rewrite type inference pass.""

* commit 'b0b52f681bcf17f193096fbaf77f3be9b1fb43a0':
  Revert "Quick: Rewrite type inference pass."