Wrong branch. Revert "Some incomplete instance tag support."

This reverts commit 17c0df141f108f5ec4f3b914535151a5b620318e.