patch lookup changed back to not using PSI (it now works much faster)