Revert "Refactor code to please vogar."

To put us back green. Will re-land after cleaning things up.

This reverts commit dc251703c2578ce7f7771a47ea3829ed5b7ad3ca.

Change-Id: Ic893ab7e24a1ad41f265cd8264ca8f14ef5982fe
1 file changed