This reverts commit e2ee8bf9. This change is beyond my ability to integrate into Google's internal build configuration tonight.