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