Revert "conditional tags"

This reverts commit 0e754d3a32d3a262aa5f8b7f7b9c55d97dbd2095.