Revert "A slightly less hacky version"

This reverts commit 6ee02df32d042c3c5a997df71c9ba7629c5bcf18.
Sugar can output Name hints, and does so when given a new tag hint. First Pass uses name hint when available, otherwise reads name in transaction