Revert "Fix and cleanup."

This reverts commit f28bad5227dd566395e458b5266e716d7fa5f958.

Change-Id: Ib64936457a1236fabbe7c6b9c56f52ef650342e7
2 files changed