Revert "Squashed commit of the following:"

This reverts commit 22dc0ec9917ffb69143a691e7afbea6372a6a566.

Change-Id: Ie48a1651037560fff1cd4c40d537efc0f5f56aa9