Revert r83877 in order to fix compilation
3 files changed