This reverts commit f9895a69fbd4432e1e1716c5335c9b7cd31b0967.