Revert pick and toolgear.lua changes