revert #47121 (#47144)