revert #15550