revert #7275