revert r71159 since it broke the build
2 files changed