Revert part of #2512, shot in the dark that it will fix integration tests
Merge pull request #2516 from brendandburns/master

Revert part of #2512, shot in the dark that it will fix integration test...