Revert "Unexpected Tags"

This reverts commit de8d3133248bb207edecb7c22a17f0fc39b093d0.