Revert "No more resolvers in Japan :("

This reverts commit ef06bdbb8b577b9acab221f9330b7cf37098adde.