Revert "Merge "Remove the My Tag feature." into gingerbread"

This reverts commit ef5694692f88bb91ed6ee1191b11a66ec594ff39, reversing
changes made to 65816a32ee2c2181895e3be636f3173a6e769f67.
2 files changed