Revert "Tags performance improvement"

This reverts commit a13ac9df1bc62cafb8eaa115008c11ea5d28b576.