Revert "conditional tags"

This reverts commit 81e6f6d1218e902e73899e427ab6bb85314e37ba.