revert #4763