Revert "Make final design changes"

This reverts commit 52a58b316df8d4f37265c226488c99d482672e09.

Change-Id: Ia055002f2fad5500fb144c8d69159b3c9115954e