This reverts commit c5919be6d2e880ac4d3f5820c38211b1c88812ff, reversing changes made to 3c8772cf020738c767b6f7a956bd002b47988932.