This reverts commit 8da14978d6a41dc520964b9f310851ecdc478a26, reversing changes made to 704ed2a5239cf28cae8c84ed1ca212511734119d.