This reverts commit af1a056788. This seems to cause Travis to segfault every once in a while. I've never been able to reproduce the instability locally, so I'm just going to pull this.
af1a056788