Add host module until upstream fixes