Revert commit 5164e8925ff11db7aa632bd735e0f0b6c82a251a.