Revert r80963 - it broke compilation everywhere
3 files changed