revert #18690