Revert "Squashed commit of the following:"

This reverts commit 91e76f094113b32e8322aca01ba686690e26fba4.

Change-Id: I49bac6874d35e6153803d2f9fbc5ccdf72a126a5