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

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