removed solder dependency

(cherry picked from commit d081b7d4a320ecf3d132836eacee23c7eba58531)