Revert commit 993212b61aa2b7358767014899a2da32ac917429.