restore fallback lookups from commit 561aecd (thanks Élie!)