Also temporarily revert r83871, to fix compilation on buildbots
3 files changed