tags fix
Revert "tags fix"

This reverts commit 08b525797910dacbbc21a96a4b0a8712dafa1256.