Revert "Sixth Commit"

This reverts commit 411dd2c321842aaec945b5ddc5db07f8bce34298.

Change-Id: Id40dc2161f749402cf5a07d94147c7834cd145c1