Revert "Merge pull request #1 from Shopify/workaround-bundler-issue"

This reverts commit 68207e757e227c56937dd01f0fc29e460da13c31, reversing
changes made to e0922ae93e43760c1c3a124d9f14d9830f6d02e7.