defbf705fc
This reverts commit 450d6cad3b. It's no longer
needed since there's no resolve session in built-ins anymore