Partially revert old gun behavior