mk/revert-retire-tags
master
This reverts commit 70303b9363042078997f3bb22adadaad5636690a, reversing changes made to 7a9d2545c45db9e7149433512dd80ec7fd674bb9.