This reverts commit 2daa0ecc731b27a4ec0a446b8324d0bdb82477be.