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

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