Revert r79127. It was causing compilation errors.