Revert "Testing a fix for parsing tags with dashes".  Need to get this in its own branch

This reverts commit 6c47f2aefa091bc35020f422394f9a81c24ae166.