Weld is not need anymore after 601919e