Revert #6937.