This reverts commit 25fc5876d3. Committed this unintentionally, looking into an alternate fix.
25fc5876d3