Revert #9209.