Revert #8458