To put us back green. Will re-land after cleaning things up. This reverts commit dc251703. Change-Id: Ic893ab7e24a1ad41f265cd8264ca8f14ef5982fe