Revert commit 0e516ff3739d00175b16a02b6787f43928c5db17.