Buzzsaw and Pungi Sticks
Revert "Buzzsaw and Pungi Sticks"

This reverts commit edf799cf038f2d240fbcda34cc82c62ccbd17067.
Merge remote-tracking branch 'origin/master'