Fix broken stuff. Don't revert brokn stuff.

Change-Id: I0abe7d9c9dd7db4aba3efd975b93d839b158aefc