Back to old tag scheme for test pass.