pipeworks: Better fix for screwdriver modified spigots