First incomplete conversion from the old PCSC build to the new one