Revert parts accidentally included in r251823