Backing out #221 for now.  It's causing errors in the integration tests.
Merge pull request #223 from garnaat/backout-221

Backing out #221 for now.  It's causing errors in the integration tests.