Revert commit d9267e77899dcff06a8e64f51d172b7a9e1b6f86