Get rid of Solder and later re-add it