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

cc @csfrancis & @pushrax 

The upstream issue was fixed in pull request https://github.com/bundler/bundler/pull/2948 and we have already upgraded bundler to take advantage of this released fix.