Fix breakage when bringing down cluster.
Merge pull request #2419 from jbeda/fix-teardown

Fix breakage when bringing down cluster.