Revert "custom pistol"

This reverts commit 85e6e2d068a60348abfdad44baf116ba35d44935.