CFY-1231 new teardown now has force flags too