Revert commit e9882b6.

Although this worked fine on OS/X, failing on Linux with Travis.