Revert "Merge pull request #1150 from Shopify/fix_travisci"

This reverts commit 61f48f643e20eeb207a3ca923109aca47824c181, reversing
changes made to 5811dbef3818d59c33f9eda5cd54138de306ee85.
Merge pull request #1172 from Shopify/revert_travis

Revert "Merge pull request #1150 from Shopify/fix_travisci"