Backed out ctag type changes since it seems autotag and ctag python friends don't want to play nice.