This reverts commit f6910a61. We're seeing crashes in the test suite of Shopify's core monolith after this change.
