Partially Revert "Reconcile some things."

This reverts commit 1b33f1f3bcdf968dedad700e3ea5d942fcc6f36c.

Change-Id: I06660d43f56a0f91c058b4f757111328283b440b