revert #911