Moved resolver pass from boot to build